diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-03-09 16:32:17 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-03-09 16:34:33 -0700 |
| commit | 6d1d7ea0bbd0ef970e22f4c87775f95fb3b8452b (patch) | |
| tree | 5c93462a94a019b5f8f3a55299d3f04fe6b2aedd /src/property/installer.lisp | |
| parent | 7cc46462f5ca23723317c2b4b6099ac7daaf7258 (diff) | |
| download | consfigurator-6d1d7ea0bbd0ef970e22f4c87775f95fb3b8452b.tar.gz | |
add "local" and "remote" to the names of some exported symbols
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/property/installer.lisp')
| -rw-r--r-- | src/property/installer.lisp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/property/installer.lisp b/src/property/installer.lisp index 43c6c9d..63d8c63 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 (mountpointp "/run") + (unless (remote-mount-point-p "/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 (mountpointp "/boot/efi") + (when (remote-mount-point-p "/boot/efi") (destructuring-bind (type source options) (words (stripln (run "findmnt" "-nro" "FSTYPE,SOURCE,OPTIONS" "/boot/efi"))) @@ -237,12 +237,12 @@ using a combinator like ON-CHANGE, or applied manually with DEPLOY-THESE." (let (done) (handler-case (flet ((rename (s d) (rename-file s d) (push (cons s d) done))) - (dolist (file (directory-contents #P"/")) + (dolist (file (local-directory-contents #P"/")) (unless (or (preservedp file) (pathname-equal file new-os) (pathname-equal file old-os)) (rename file (chroot-pathname file old-os)))) - (dolist (file (directory-contents new-os)) + (dolist (file (local-directory-contents new-os)) (let ((dest (in-chroot-pathname file new-os))) (unless (preservedp dest) (when (or (file-exists-p dest) (directory-exists-p dest)) |