From c1650ee136328e578fee5df3199c55ca41113ed9 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Wed, 14 Nov 2012 19:39:29 +0200 Subject: [PATCH] 0.4.0.1-alt1 - TMP: s,/mnt/disk,/boot/efi,g to test EFI installation --- evms.scm | 8 ++++---- guile-evms.spec | 7 +++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/evms.scm b/evms.scm index 4b23f77..93beab7 100644 --- a/evms.scm +++ b/evms.scm @@ -26,7 +26,7 @@ ("/var/ftp" . "nodev,nosuid,relatime") ("/var/www" . "nodev,relatime") ("/var/cache/squid" . "nodev,noexec,nosuid,relatime") - ("/mnt/disk" . #f))) + ("/boot/efi" . #f))) (define bare-mountpoints '("/boot")) @@ -111,9 +111,9 @@ "Assign mountpoint" "Invalid mountpoint: not a SWAPFS"))) ((member (assv-ref ((assv-ref (obj) 'fsim)) 'name) '("FAT16" "FAT32" "NTFS")) - (or (string-prefix? "/mnt/" val) + (or (string-prefix? "/boot/efi" val) (throw 'swig-system-error - "Assign mountpoint" "Invalid mountpoint: should start with /mnt"))) + "Assign mountpoint" "Invalid mountpoint: should start with /boot/efi (FIXME: maybe)"))) (#t #t))) (define (mntpoint-unique? obj val) @@ -571,7 +571,7 @@ obj 'mntpoint (cond ((or (isntfs? obj) (isfat? obj)) - "/mnt/disk") + "/boot/efi") ((islvm? obj) (let ((sane-mountpoints (filter (lambda(s) (not (member s bare-mountpoints))) rest))) (if (null? sane-mountpoints) "" diff --git a/guile-evms.spec b/guile-evms.spec index eb1b08d..39194c3 100644 --- a/guile-evms.spec +++ b/guile-evms.spec @@ -1,6 +1,6 @@ Name: guile-evms -Version: 0.4 -Release: alt11 +Version: 0.4.0.1 +Release: alt1 Summary: Guile bindings for EVMS License: GPL @@ -28,6 +28,9 @@ make install DESTDIR=%buildroot %_datadir/guile/site/evms.scm %changelog +* Wed Nov 14 2012 Michael Shigorin 0.4.0.1-alt1 +- TMP: s,/mnt/disk,/boot/efi,g to test EFI installation + * Thu Jul 07 2011 Sergey Bolshakov 0.4-alt11 - revert back to pre-alt10 state (#25774, #25861) -- 1.7.12.4