Attachment #5633 for bug #27979

View | Details | Raw Unified | Return to bug 27979
Collapse All | Expand All




    ("/var/ftp" . "nodev,nosuid,relatime")
    ("/var/www" . "nodev,relatime")
    ("/var/cache/squid" . "nodev,noexec,nosuid,relatime")
    ("/boot/efi" . #f)))

(define bare-mountpoints '("/boot"))


               "Assign mountpoint" "Invalid mountpoint: not a SWAPFS")))

   ((member (assv-ref ((assv-ref (obj) 'fsim)) 'name) '("FAT16" "FAT32" "NTFS"))
    (or (string-prefix? "/boot/efi" val)
        (throw 'swig-system-error
               "Assign mountpoint" "Invalid mountpoint: should start with /boot/efi (FIXME: maybe)")))
   (#t #t)))

(define (mntpoint-unique? obj val)

                             obj 'mntpoint
                             (cond ((or (isntfs? obj)
                                        (isfat? obj))
                                    "/boot/efi")
                                   ((islvm? obj)
                                    (let ((sane-mountpoints (filter (lambda(s) (not (member s bare-mountpoints))) rest)))
                                      (if (null? sane-mountpoints) ""

Lines 1-6 Link Here

(-)a/guile-evms.spec (-3 / +5 lines)
1	Name: guile-evms	1	Name: guile-evms
2	Version: 0.4	2	Version: 0.4.0.1
3	Release: alt11	3	Release: alt1
4		4
5	Summary: Guile bindings for EVMS	5	Summary: Guile bindings for EVMS
6	License: GPL	6	License: GPL
Lines 28-33 make install DESTDIR=%buildroot Link Here
28	%_datadir/guile/site/evms.scm	28	%_datadir/guile/site/evms.scm
29		29
30	%changelog	30	%changelog
		31	* Wed Nov 14 2012 Michael Shigorin <mike@altlinux.org> 0.4.0.1-alt1
		32	- TMP: s,/mnt/disk,/boot/efi,g to test EFI installation
		33
31	* Thu Jul 07 2011 Sergey Bolshakov <sbolshakov@altlinux.ru> 0.4-alt11	34	* Thu Jul 07 2011 Sergey Bolshakov <sbolshakov@altlinux.ru> 0.4-alt11
32	- revert back to pre-alt10 state (#25774, #25861)	35	- revert back to pre-alt10 state (#25774, #25861)
33		36
34	-

Return to bug 27979

Lines 26-32 Link Here

(-)a/evms.scm (-4 / +4 lines)
26	("/var/ftp" . "nodev,nosuid,relatime")	26	("/var/ftp" . "nodev,nosuid,relatime")
27	("/var/www" . "nodev,relatime")	27	("/var/www" . "nodev,relatime")
28	("/var/cache/squid" . "nodev,noexec,nosuid,relatime")	28	("/var/cache/squid" . "nodev,noexec,nosuid,relatime")
29	("/mnt/disk" . #f)))	29	("/boot/efi" . #f)))
30		30
31	(define bare-mountpoints '("/boot"))	31	(define bare-mountpoints '("/boot"))
32		32
Lines 111-119 Link Here
111	"Assign mountpoint" "Invalid mountpoint: not a SWAPFS")))	111	"Assign mountpoint" "Invalid mountpoint: not a SWAPFS")))
112		112
113	((member (assv-ref ((assv-ref (obj) 'fsim)) 'name) '("FAT16" "FAT32" "NTFS"))	113	((member (assv-ref ((assv-ref (obj) 'fsim)) 'name) '("FAT16" "FAT32" "NTFS"))
114	(or (string-prefix? "/mnt/" val)	114	(or (string-prefix? "/boot/efi" val)
115	(throw 'swig-system-error	115	(throw 'swig-system-error
116	"Assign mountpoint" "Invalid mountpoint: should start with /mnt")))	116	"Assign mountpoint" "Invalid mountpoint: should start with /boot/efi (FIXME: maybe)")))
117	(#t #t)))	117	(#t #t)))
118		118
119	(define (mntpoint-unique? obj val)	119	(define (mntpoint-unique? obj val)
Lines 571-577 Link Here
571	obj 'mntpoint	571	obj 'mntpoint
572	(cond ((or (isntfs? obj)	572	(cond ((or (isntfs? obj)
573	(isfat? obj))	573	(isfat? obj))
574	"/mnt/disk")	574	"/boot/efi")
575	((islvm? obj)	575	((islvm? obj)
576	(let ((sane-mountpoints (filter (lambda(s) (not (member s bare-mountpoints))) rest)))	576	(let ((sane-mountpoints (filter (lambda(s) (not (member s bare-mountpoints))) rest)))
577	(if (null? sane-mountpoints) ""	577	(if (null? sane-mountpoints) ""