From e527203b7552536d0ff1f50f6a3e5e2c44c3f42f Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Wed, 14 Nov 2012 19:10:40 +0200 Subject: [PATCH 1/2] TMP: rough sketchy EFI support guile: uncaught throw to internal-error: (unbound-variable #f "Unbound variable: ~S" (new-handle-object-info-t) #f) --- evms.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/evms.scm b/evms.scm index 4b23f77..5347cf2 100644 --- a/evms.scm +++ b/evms.scm @@ -26,6 +26,7 @@ ("/var/ftp" . "nodev,nosuid,relatime") ("/var/www" . "nodev,relatime") ("/var/cache/squid" . "nodev,noexec,nosuid,relatime") + ("/boot/efi" . #f) ("/mnt/disk" . #f))) (define bare-mountpoints '("/boot")) @@ -112,6 +113,7 @@ ((member (assv-ref ((assv-ref (obj) 'fsim)) 'name) '("FAT16" "FAT32" "NTFS")) (or (string-prefix? "/mnt/" val) + (string=? val "/boot/efi") (throw 'swig-system-error "Assign mountpoint" "Invalid mountpoint: should start with /mnt"))) (#t #t))) @@ -569,8 +571,9 @@ (or (object-option-value obj 'mntpoint) (set-object-option! obj 'mntpoint - (cond ((or (isntfs? obj) - (isfat? obj)) + (cond ((isfat? obj) + "/boot/efi") + ((isntfs? obj) "/mnt/disk") ((islvm? obj) (let ((sane-mountpoints (filter (lambda(s) (not (member s bare-mountpoints))) rest))) -- 1.7.12.4