hotfix: failed to start if binfmt_misc was not mounted (first launch with installer)

nzbr · nzbr · commit 47ab671f0707 · 2022-03-30T23:38:41.000+02:00
diff --git a/syschdemd.nix b/syschdemd.nix
@@ -14,7 +14,7 @@ pkgs.substituteAll {
   fsPackagesPath = lib.makeBinPath config.system.fsPackages;
 
   systemdWrapper = pkgs.writeShellScript "systemd-wrapper.sh" ''
-    mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
+    mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc || true
     exec systemd
   '';
 }
diff --git a/syschdemd.sh b/syschdemd.sh
@@ -16,7 +16,7 @@ if [ ! -e "/run/current-system" ]; then
 fi
 
 if [ ! -e "/run/systemd.pid" ]; then
-    @wrapperDir@/umount /proc/sys/fs/binfmt_misc
+    @wrapperDir@/umount /proc/sys/fs/binfmt_misc || true
 
     PATH=/run/current-system/systemd/lib/systemd:@fsPackagesPath@ \
         LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive \

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ pkgs.substituteAll {`
`14`	`14`	`fsPackagesPath = lib.makeBinPath config.system.fsPackages;`
`15`	`15`
`16`	`16`	`systemdWrapper = pkgs.writeShellScript "systemd-wrapper.sh" ''`
`17`		`- mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc`
	`17`	`+ mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc \|\| true`
`18`	`18`	`exec systemd`
`19`	`19`	`'';`
`20`	`20`	`}`