Merge pull request #13 from arkane-systems/dev-0.7

Quick update for 0.68.2.

Makefile

@@ -3,7 +3,7 @@
 #
 
 # Bottle-Imp version
-IMPVERSION = 0.5
+IMPVERSION = 0.7
 
 # Determine this makefile's path.
 # Be sure to place this BEFORE `include` directives, if any.
@@ -163,18 +163,13 @@ internal-package:
 
 	# Runtime dir mapping
 	install -Dm 0755 -o root "othersrc/scripts/wait-forever.sh" -t "$(INSTALLDIR)"
-	install -Dm 0755 -o root "othersrc/scripts/map-user-runtime-dir.sh" -t "$(INSTALLDIR)"
-	install -Dm 0755 -o root "othersrc/scripts/unmap-user-runtime-dir.sh" -t "$(INSTALLDIR)"
 
 	# Systemd services.
 	install -Dm 0644 -o root "othersrc/usr-lib/systemd/system/pstorefs.service" -T "$(SVCDIR)/pstorefs.service"
 	install -Dm 0644 -o root "othersrc/usr-lib/systemd/system/securityfs.service" -T "$(SVCDIR)/securityfs.service"
 
 	# WSLg mount file
-	install -Dm 0644 -o root "othersrc/usr-lib/systemd/system/tmp-.X11\x2dunix.mount" -T "$(SVCDIR)/tmp-.X11\x2dunix.mount"
-
-	# Tmpfiles.
-	install -Dm 0644 -o root "othersrc/usr-lib/tmpfiles.d/bottle-imp.conf" -T "$(USRLIBDIR)/tmpfiles.d/bottle-imp.conf"
+	install -Dm 0644 -o root "othersrc/usr-lib/systemd/system/wslg-socket.service" -T "$(SVCDIR)/wslg-socket.service"
 
 	# Unit override files.
 	install -Dm 0644 -o root "othersrc/usr-lib/systemd/system/user-runtime-dir@.service.d/override.conf" -t "$(SVCDIR)/user-runtime-dir@.service.d"
@@ -214,9 +209,9 @@ internal-supplement:
 	mkdir -p "$(ETCSVCDIR)/sysinit.target.wants"
 	ln -sr $(SVCDIR)/pstorefs.service $(ETCSVCDIR)/sysinit.target.wants/pstorefs.service
 	ln -sr $(SVCDIR)/securityfs.service $(ETCSVCDIR)/sysinit.target.wants/securityfs.service
-	ln -sr $(SVCDIR)/tmp-.X11\x2dunix.mount $(ETCSVCDIR)/sysinit.target.wants/tmp-.X11\x2dunix.mount
 
 	mkdir -p "$(ETCSVCDIR)/multi-user.target.wants"
+	ln -sr $(SVCDIR)/wslg-socket.service $(ETCSVCDIR)/multi-user.target.wants/wslg-socket.service
 	ln -sr $(SVCDIR)/systemd-machined.service $(ETCSVCDIR)/multi-user.target.wants/systemd-machined.service
 
 	# Cleanup temporary directory

PKGBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Alistair Young <avatar@arkane-systems.net>
 pkgname=bottle-imp
-pkgver=0.6
+pkgver=0.7
 pkgrel=1
 pkgdesc="A helper for WSL's native systemd support."
 arch=('x86_64')

binsrc/imp/__main__.py

@@ -10,7 +10,7 @@
 import helpers
 
 # Global variables
-version = "0.6"
+version = "0.7"
 
 verbose = False
 login = None

debian/bottle-imp.links

@@ -1,4 +1,4 @@
 /usr/lib/systemd/system/systemd-machined.service /etc/systemd/system/multi-user.target.wants/systemd-machined.service
 /usr/lib/systemd/system/pstorefs.service /etc/systemd/system/sysinit.target.wants/pstorefs.service
 /usr/lib/systemd/system/securityfs.service /etc/systemd/system/sysinit.target.wants/securityfs.service
-/usr/lib/systemd/system/tmp-.X11\x2dunix.mount /etc/systemd/system/sysinit.target.wants/tmp-.X11\x2dunix.mount
+/usr/lib/systemd/system/wslg-socket.service /etc/systemd/system/multi-user.target.wants/wslg-socket.service

debian/changelog

@@ -1,3 +1,11 @@
+bottle-imp (0.7) buster bullseye bookworm sid focal jammy; urgency=medium
+
+        * 0.68.2 - remove the tmpfiles config.
+        * 0.68.2 - user runtime directory handling adapted to pre-mapping.
+        * 0.68.2 - modified .X11-unix mounting routine.
+
+ -- Alistair Young <avatar@arkane-systems.net>  Tue, 27 Sep 2022 23:00:01 -0500
+
 bottle-imp (0.6) buster bullseye bookworm sid focal jammy; urgency=medium
 
         * Additions to tmpfiles for things disabled by systemd support.

othersrc/usr-lib/systemd/system/user-runtime-dir@.service.d/override.conf

@@ -1,9 +1,2 @@
-[Service]
-[Service]
-ExecStart=
-ExecStart=/lib/systemd/systemd-user-runtime-dir start %i
-ExecStart=/usr/lib/bottle-imp/map-user-runtime-dir.sh %i
-ExecStop=
-ExecStop=/usr/lib/bottle-imp/unmap-user-runtime-dir.sh %i
-ExecStop=/lib/systemd/systemd-user-runtime-dir stop %i
-
+[Unit]
+ConditionPathIsMountPoint=!/run/user/%i

othersrc/usr-lib/systemd/system/wslg-socket.service

@@ -0,0 +1,15 @@
+[Unit]
+Description=WSLg socket remount service
+After=tmp.mount
+After=systemd-tmpfiles.setup.service
+Before=multi-user.target
+ConditionPathExists=/tmp/.X11-unix
+ConditionPathIsMountPoint=!/tmp/.X11-unix
+ConditionPathExists=/mnt/wslg/.X11-unix
+
+[Service]
+Type=oneshot
+ExecStart=/bin/mount --bind -o ro /mnt/wslg/.X11-unix /tmp/.X11-unix
+
+[Install]
+WantedBy=multi-user.target