aboutsummaryrefslogtreecommitdiff
path: root/src/property/installer.lisp
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2021-07-10 19:02:50 -0700
committerSean Whitton <spwhitton@spwhitton.name>2021-07-10 21:49:23 -0700
commitb1b4001db08c9a0b094523df18d287336651eeef (patch)
treece0b5e962a73daf3790d496f8b6f16947ffe935f /src/property/installer.lisp
parent102214763c91bb4b4f75bccd28f0e481f5eed8f8 (diff)
downloadconsfigurator-b1b4001db08c9a0b094523df18d287336651eeef.tar.gz
factor out MOUNTPOINTP
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/property/installer.lisp')
-rw-r--r--src/property/installer.lisp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/property/installer.lisp b/src/property/installer.lisp
index 72119a0..0196438 100644
--- a/src/property/installer.lisp
+++ b/src/property/installer.lisp
@@ -189,7 +189,7 @@ using a combinator like ON-CHANGE, or applied manually with DEPLOY-THESE."
(flet ((preservedp (pathname)
(member pathname preserved-directories :test #'pathname-equal)))
(mount:assert-devtmpfs-udev-/dev)
- (unless (zerop (mrun :for-exit "mountpoint" "-q" "/run"))
+ (unless (mountpointp "/run")
(failed-change "/run is not a mount point; don't know what to do."))
;; If there's an EFI system partition, we need to store knowledge of
@@ -198,7 +198,7 @@ using a combinator like ON-CHANGE, or applied manually with DEPLOY-THESE."
;; is responsible for adding an entry for the EFI system partition to
;; the new system's fstab, but we are responsible for restoring
;; knowledge of the partition to the kernel's mount table.
- (when (zerop (mrun :for-exit "mountpoint" "-q" "/boot/efi"))
+ (when (mountpointp "/boot/efi")
(destructuring-bind (type source options)
(words (stripln (run "findmnt" "-nro" "FSTYPE,SOURCE,OPTIONS"
"/boot/efi")))