INSTALLER:CLEANLY-INSTALLED-ONCE: preserve /sys

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

1 files changed, 6 insertions, 5 deletions

diff --git a/src/property/installer.lisp b/src/property/installer.lisp
index fd2fce3..ba2e21f 100644
--- a/src/property/installer.lisp
+++ b/src/property/installer.lisp
@@ -177,8 +177,12 @@ using a combinator like ON-CHANGE, or applied manually with DEPLOY-THESE."
            '(;; These dirs can contain sockets, remote Lisp image output,
              ;; etc.; avoid upsetting those.
              #P"/run/" #P"/tmp/"
-             ;; Makes sense to keep /proc until we replace the running init.
-             #P"/proc/"))
+             ;; Makes sense to keep /proc until we replace the running init,
+             ;; and we want to retain all the systemd virtual filesystems
+             ;; under /sys to avoid problems applying other properties.  Both
+             ;; are empty directories right after debootstrap, so nothing to
+             ;; copy out.
+             #P"/proc/" #P"/sys/"))
          efi-system-partition-mount-args)
      (flet ((preservedp (pathname)
               (member pathname preserved-directories :test #'pathname-equal)))
@@ -256,9 +260,6 @@ using a combinator like ON-CHANGE, or applied manually with DEPLOY-THESE."
        (dolist (mount mount:*standard-linux-vfs*)
          (unless (preservedp (ensure-directory-pathname (lastcar mount)))
            (apply #'system "mount" mount)))
-       (when (and (not (preservedp #P"/sys/"))
-                  (directory-exists-p "/sys/firmware/efi/efivars"))
-         (apply #'mrun "mount" mount:*linux-efivars-vfs*))
        (when efi-system-partition-mount-args
          (ensure-directories-exist #P"/boot/efi/")
          (apply #'mrun "mount" efi-system-partition-mount-args))))))