From 69bb8712cfb2f13cfca50efbded62624a0a6dcdf Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 3 May 2021 15:43:48 -0700 Subject: INSTALLER:CHROOT-INSTALLED-TO-VOLUMES: use OS:ETYPECASE Signed-off-by: Sean Whitton --- src/package.lisp | 3 ++- src/property/installer.lisp | 22 ++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/package.lisp b/src/package.lisp index 9d69cf3..bcdab16 100644 --- a/src/package.lisp +++ b/src/package.lisp @@ -460,7 +460,8 @@ (defpackage :consfigurator.property.installer (:use #:cl #:alexandria #:consfigurator #:consfigurator.property.disk) - (:local-nicknames (#:file #:consfigurator.property.file) + (:local-nicknames (#:os #:consfigurator.property.os) + (#:file #:consfigurator.property.file) (#:chroot #:consfigurator.property.chroot) (#:fstab #:consfigurator.property.fstab)) (:export #:chroot-installed-to-volumes)) diff --git a/src/property/installer.lisp b/src/property/installer.lisp index 93f9841..ba7362f 100644 --- a/src/property/installer.lisp +++ b/src/property/installer.lisp @@ -49,16 +49,18 @@ Also update the fstab and crypttab, and try to install a bootloader." ,(make-propspec :systems nil :propspec - '(eseqprops - ;; This will overwrite any custom mount options, etc., with values - ;; from VOLUMES. Possibly it would be better to use a property - ;; which only updates the fs-spec field. However, given that - ;; VOLUMES ultimately comes from the volumes the user has declared - ;; for the host, it is unlikely there are other properties setting - ;; mount options etc. which are in conflict with VOLUMES. - (fstab:entries-for-opened-volumes) - ;; Debian and derivatives add this line. - (file:lacks-lines "/etc/fstab" "# UNCONFIGURED FSTAB FOR BASE SYSTEM")))) + '(os:etypecase + (debianlike + (file:lacks-lines "/etc/fstab" + "# UNCONFIGURED FSTAB FOR BASE SYSTEM") + ;; This will overwrite any custom mount options, etc., with + ;; values from VOLUMES. Possibly it would be better to use a + ;; property which only updates the fs-spec field. However, + ;; given that VOLUMES ultimately comes from the volumes the + ;; user has declared for the host, it is unlikely there are + ;; other properties setting mount options etc. which are in + ;; conflict with VOLUMES. + (fstab:entries-for-opened-volumes))))) ;; TODO Update /etc/crypttab ;; TODO Install bootloader ))) -- cgit v1.2.3