aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2021-07-10 00:45:43 -0700
committerSean Whitton <spwhitton@spwhitton.name>2021-07-10 21:42:22 -0700
commit4cfd98698d1e8e670e2824e53574903f61ad82bc (patch)
treeee6f7f9d36aa30d4a773a65006377859e345747a
parent5d25eb6f35f2067057fd2a4b1af91b1663f8d229 (diff)
downloadconsfigurator-4cfd98698d1e8e670e2824e53574903f61ad82bc.tar.gz
move /run out from MOUNT:*STANDARD-LINUX-VFS*
Bind-mounting /run is really a chroot connection-specific operation. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
-rw-r--r--src/connection/chroot.lisp1
-rw-r--r--src/property/mount.lisp3
2 files changed, 2 insertions, 2 deletions
diff --git a/src/connection/chroot.lisp b/src/connection/chroot.lisp
index 7fbe860..acf8053 100644
--- a/src/connection/chroot.lisp
+++ b/src/connection/chroot.lisp
@@ -73,6 +73,7 @@ should be the mount point, without the chroot's root prefixed.")
(mount:assert-devtmpfs-udev-/dev)
(dolist (mount mount:*standard-linux-vfs*)
(apply #'chroot-mount connection mount))
+ (chroot-mount connection "--bind" "/run" "/run")
(when (remote-exists-p "/sys/firmware/efi/efivars")
(apply #'chroot-mount connection mount:*linux-efivars-vfs*)))))
diff --git a/src/property/mount.lisp b/src/property/mount.lisp
index 1cfd2ca..21d5530 100644
--- a/src/property/mount.lisp
+++ b/src/property/mount.lisp
@@ -99,8 +99,7 @@ Uses findmnt(8), so Linux-specific."
("-t" "devtmpfs" "-o" "mode=0755,nosuid" "udev" "/dev")
("-t" "devpts" "-o" "mode=0620,gid=5,nosuid,noexec" "devpts" "/dev/pts")
("-t" "tmpfs" "-o" "mode=1777,nosuid,nodev" "shm" "/dev/shm")
-("-t" "tmpfs" "-o" "mode=1777,strictatime,nodev,nosuid" "tmp" "/tmp")
-("--bind" "/run" "/run")))
+("-t" "tmpfs" "-o" "mode=1777,strictatime,nodev,nosuid" "tmp" "/tmp")))
(defparameter *linux-efivars-vfs*
'("-t" "efivarfs" "-o" "nosuid,noexec,nodev" "efivarfs"