diff options
| -rw-r--r-- | src/connection/chroot.lisp | 2 | ||||
| -rw-r--r-- | src/package.lisp | 2 | ||||
| -rw-r--r-- | src/property/installer.lisp | 2 | ||||
| -rw-r--r-- | src/property/mount.lisp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/connection/chroot.lisp b/src/connection/chroot.lisp index aae0ad5..e2aa10c 100644 --- a/src/connection/chroot.lisp +++ b/src/connection/chroot.lisp @@ -61,7 +61,7 @@ should be the mount point, without the chroot's root prefixed.") (chroot-mount connection "--bind" into "/")) ;; Now set up the usual bind mounts. Help here from arch-chroot(8). (mount:assert-devtmpfs-udev-/dev) - (dolist (mount mount:*standard-linux-vfs*) + (dolist (mount mount:*linux-basic-vfs*) (apply #'chroot-mount connection mount)) (chroot-mount connection "--bind" "/run" "/run") (when (remote-exists-p "/sys/firmware/efi/efivars") diff --git a/src/package.lisp b/src/package.lisp index 34a2dd3..8a83f04 100644 --- a/src/package.lisp +++ b/src/package.lisp @@ -485,7 +485,7 @@ #:unmounted-below #:unmounted-below-and-removed #:all-mounts - #:*standard-linux-vfs* + #:*linux-basic-vfs* #:*linux-efivars-vfs* #:assert-devtmpfs-udev-/dev)) diff --git a/src/property/installer.lisp b/src/property/installer.lisp index 7c0e306..60c17d7 100644 --- a/src/property/installer.lisp +++ b/src/property/installer.lisp @@ -285,7 +285,7 @@ using a combinator like ON-CHANGE, or applied manually with DEPLOY-THESE." ;; Remount (mainly virtual) filesystems that other properties we will ;; apply might require (esp. relevant for installing bootloaders). - (dolist (mount mount:*standard-linux-vfs*) + (dolist (mount mount:*linux-basic-vfs*) (unless (preservedp (ensure-directory-pathname (lastcar mount))) (apply #'system "mount" mount))) (when efi-system-partition-mount-args diff --git a/src/property/mount.lisp b/src/property/mount.lisp index dc6a559..98013a2 100644 --- a/src/property/mount.lisp +++ b/src/property/mount.lisp @@ -103,7 +103,7 @@ Uses findmnt(8), so Linux-specific." ;;;; Utilities for :LISP properties -(defparameter *standard-linux-vfs* '( +(defparameter *linux-basic-vfs* '( ("-t" "proc" "-o" "nosuid,noexec,nodev" "proc" "/proc") ("-t" "sysfs" "-o" "nosuid,noexec,nodev,ro" "sys" "/sys") ("-t" "devtmpfs" "-o" "mode=0755,nosuid" "udev" "/dev") |