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

(-)a/evms.scm (-3 / +5 lines)
Lines 26-31 Link Here
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
    ("/boot/efi" . #f)
29
    ("/mnt/disk" . #f)))
30
    ("/mnt/disk" . #f)))
30
31
31
(define bare-mountpoints '("/boot"))
32
(define bare-mountpoints '("/boot"))
Lines 112-117 Link Here
112
113
113
   ((member (assv-ref ((assv-ref (obj) 'fsim)) 'name) '("FAT16" "FAT32" "NTFS"))
114
   ((member (assv-ref ((assv-ref (obj) 'fsim)) 'name) '("FAT16" "FAT32" "NTFS"))
114
    (or (string-prefix? "/mnt/" val)
115
    (or (string-prefix? "/mnt/" val)
116
        (string=? val "/boot/efi")
115
        (throw 'swig-system-error
117
        (throw 'swig-system-error
116
               "Assign mountpoint" "Invalid mountpoint: should start with /mnt")))
118
               "Assign mountpoint" "Invalid mountpoint: should start with /mnt")))
117
   (#t #t)))
119
   (#t #t)))
Lines 569-576 Link Here
569
                        (or (object-option-value obj 'mntpoint)
571
                        (or (object-option-value obj 'mntpoint)
570
                            (set-object-option!
572
                            (set-object-option!
571
                             obj 'mntpoint
573
                             obj 'mntpoint
572
                             (cond ((or (isntfs? obj)
574
                             (cond ((isfat? obj)
573
                                        (isfat? obj))
575
                                    "/boot/efi")
576
                                   ((isntfs? obj)
574
                                    "/mnt/disk")
577
                                    "/mnt/disk")
575
                                   ((islvm? obj)
578
                                   ((islvm? obj)
576
                                    (let ((sane-mountpoints (filter (lambda(s) (not (member s bare-mountpoints))) rest)))
579
                                    (let ((sane-mountpoints (filter (lambda(s) (not (member s bare-mountpoints))) rest)))
577
- 

Return to bug 27979