diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-04-16 15:35:55 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-04-16 15:35:55 -0700 |
| commit | 953b38327019b070f27e247f9116d0c51f8d9bac (patch) | |
| tree | ef0e4a9a5ed58c085f7537c18b490c7194ff10f2 /src/property | |
| parent | e2a3387cf777c5b190d70475e98ada83b9abbc4a (diff) | |
| download | consfigurator-953b38327019b070f27e247f9116d0c51f8d9bac.tar.gz | |
convert *LINUX-{BASIC,EFIVARS}-VFS* -> +LINUX-{BASIC,EFIVARS}-VFS+
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/property')
| -rw-r--r-- | src/property/installer.lisp | 2 | ||||
| -rw-r--r-- | src/property/mount.lisp | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/property/installer.lisp b/src/property/installer.lisp index bad2255..0791918 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:*linux-basic-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 98013a2..733f0b5 100644 --- a/src/property/mount.lisp +++ b/src/property/mount.lisp @@ -103,19 +103,21 @@ Uses findmnt(8), so Linux-specific." ;;;; Utilities for :LISP properties -(defparameter *linux-basic-vfs* '( +(define-constant +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") ("-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"))) +("-t" "tmpfs" "-o" "mode=1777,strictatime,nodev,nosuid" "tmp" "/tmp")) + :test #'equal) -(defparameter *linux-efivars-vfs* - '("-t" "efivarfs" "-o" "nosuid,noexec,nodev" "efivarfs" - "/sys/firmware/efi/efivars") - "Arguments to mount(8) to mount the UEFI NVRAM. -After mounting /sys, mount this when /sys/firmware/efi/efivars exists.") +(define-constant +linux-efivars-vfs+ + '("-t" "efivarfs" "-o" "nosuid,noexec,nodev" "efivarfs" + "/sys/firmware/efi/efivars") + :documentation "Arguments to mount(8) to mount the UEFI NVRAM. +After mounting /sys, mount this when /sys/firmware/efi/efivars exists." + :test #'equal) (defun assert-devtmpfs-udev-/dev () "On a system with the Linux kernel, assert that /dev has fstype devtmpfs." |