Merge pull request #15 from arkane-systems/dev-0.8

Merge request for dev-0.8.

Makefile

@@ -3,7 +3,7 @@
 #
 
 # Bottle-Imp version
-IMPVERSION = 0.7
+IMPVERSION = 0.8
 
 # Determine this makefile's path.
 # Be sure to place this BEFORE `include` directives, if any.
@@ -164,9 +164,10 @@ internal-package:
 	# Runtime dir mapping
 	install -Dm 0755 -o root "othersrc/scripts/wait-forever.sh" -t "$(INSTALLDIR)"
 
-	# Systemd services.
+	# Systemd-as-container compensation 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"
+	install -Dm 0644 -o root "othersrc/usr-lib/systemd/system/remount-root-shared.service" -T "$(SVCDIR)/remount-root-shared.service"
 
 	# WSLg mount file
 	install -Dm 0644 -o root "othersrc/usr-lib/systemd/system/wslg-socket.service" -T "$(SVCDIR)/wslg-socket.service"
@@ -209,6 +210,7 @@ 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)/remount-root-shared.service $(ETCSVCDIR)/sysinit.target.wants/remount-root-shared.service
 
 	mkdir -p "$(ETCSVCDIR)/multi-user.target.wants"
 	ln -sr $(SVCDIR)/wslg-socket.service $(ETCSVCDIR)/multi-user.target.wants/wslg-socket.service

binsrc/imp/__main__.py

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

debian/bottle-imp.links

@@ -2,3 +2,4 @@
 /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/wslg-socket.service /etc/systemd/system/multi-user.target.wants/wslg-socket.service
+/usr/lib/systemd/system/remount-root-shared.service /etc/systemd/system/sysinit.target.wants/remount-root-shared.service

debian/changelog

@@ -1,3 +1,9 @@
+bottle-imp (0.8) buster bullseye bookworm sid focal jammy; urgency=medium
+
+        * Added remounting of / as shared (container mode loss).
+
+ -- Alistair Young <[email protected]>  Fri, 07 Oct 2022 18:00:00 -0500
+
 bottle-imp (0.7) buster bullseye bookworm sid focal jammy; urgency=medium
 
         * 0.68.2 - remove the tmpfiles config.

othersrc/usr-lib/systemd/system/remount-root-shared.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=Remount Root Filesystem Shared
+DefaultDependencies=no
+Before=sysinit.target
+
+[Service]
+Type=oneshot
+ExecStart=/bin/mount --make-rshared /
+
+[Install]
+WantedBy=sysinit.target