nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

system: Remove uses of the 'title' field of <file-system>. 

* gnu/system/install.scm (installation-os): Remove uses of the 'title'
field of 'file-system'; use 'file-system-label' as appropriate.
* gnu/system/vm.scm (system-disk-image, system-qemu-image): Likewise.
* gnu/tests.scm (%simple-os): Likewise.
* gnu/tests/install.scm (%minimal-os, %minimal-extlinux-os)
(%minimal-os-on-vda, %separate-home-os, %separate-store-os)
(%raid-root-os, %encrypted-root-os, %btrfs-root-os): Likewise.
* gnu/build/shepherd.scm (default-mounts)[tmpfs]: Likewise.
* tests/guix-system.sh: Likewise.
* tests/system.scm (%root-fs): Likewise.
("operating-system-boot-mapped-devices, implicit dependency"): Likewise.
This commit is contained in:
Ludovic Courtès 2018-05-18 15:04:36 +02:00
parent a5acc17a3c
commit 9ceeca0880
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
7 changed files with 16 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnu/build/shepherd.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -55,7 +55,6 @@
(define (tmpfs directory) (define (tmpfs directory)
(file-system (file-system
(device "none") (device "none")
(title 'device)
(mount-point directory) (mount-point directory)
(type "tmpfs") (type "tmpfs")
(check? #f))) (check? #f)))

4
gnu/system/install.scm
View File

@ -328,8 +328,7 @@ You have been warned. Thanks for being so brave.\x1b[0m
;; the appropriate one. ;; the appropriate one.
(cons* (file-system (cons* (file-system
(mount-point "/") (mount-point "/")
(device "GuixSD_image") (device (file-system-label "GuixSD_image"))
(title 'label)
(type "ext4")) (type "ext4"))
;; Make /tmp a tmpfs instead of keeping the overlayfs. This ;; Make /tmp a tmpfs instead of keeping the overlayfs. This
@ -341,7 +340,6 @@ You have been warned. Thanks for being so brave.\x1b[0m
(file-system (file-system
(mount-point "/tmp") (mount-point "/tmp")
(device "none") (device "none")
(title 'device)
(type "tmpfs") (type "tmpfs")
(check? #f)) (check? #f))

2
gnu/system/vm.scm
View File

@ -571,7 +571,6 @@ to USB sticks meant to be read-only."
(file-systems (cons (file-system (file-systems (cons (file-system
(mount-point "/") (mount-point "/")
(device root-uuid) (device root-uuid)
(title 'uuid)
(type file-system-type)) (type file-system-type))
file-systems-to-keep))))) file-systems-to-keep)))))
@ -636,7 +635,6 @@ of the GNU system as described by OS."
(file-systems (cons (file-system (file-systems (cons (file-system
(mount-point "/") (mount-point "/")
(device root-uuid) (device root-uuid)
(title 'uuid)
(type file-system-type)) (type file-system-type))
file-systems-to-keep))))) file-systems-to-keep)))))
(mlet* %store-monad (mlet* %store-monad

3
gnu/tests.scm
View File

@ -208,8 +208,7 @@ the system under test."
(bootloader grub-bootloader) (bootloader grub-bootloader)
(target "/dev/sdX"))) (target "/dev/sdX")))
(file-systems (cons (file-system (file-systems (cons (file-system
(device "my-root") (device (file-system-label "my-root"))
(title 'label)
(mount-point "/") (mount-point "/")
(type "ext4")) (type "ext4"))
%base-file-systems)) %base-file-systems))

26
gnu/tests/install.scm
View File

@ -66,8 +66,7 @@
(target "/dev/vdb"))) (target "/dev/vdb")))
(kernel-arguments '("console=ttyS0")) (kernel-arguments '("console=ttyS0"))
(file-systems (cons (file-system (file-systems (cons (file-system
(device "my-root") (device (file-system-label "my-root"))
(title 'label)
(mount-point "/") (mount-point "/")
(type "ext4")) (type "ext4"))
%base-file-systems)) %base-file-systems))
@ -105,8 +104,7 @@
(target "/dev/vdb"))) (target "/dev/vdb")))
(kernel-arguments '("console=ttyS0")) (kernel-arguments '("console=ttyS0"))
(file-systems (cons (file-system (file-systems (cons (file-system
(device "my-root") (device (file-system-label "my-root"))
(title 'label)
(mount-point "/") (mount-point "/")
(type "ext4")) (type "ext4"))
%base-file-systems)) %base-file-systems))
@ -351,8 +349,7 @@ per %test-installed-os, this test is expensive in terms of CPU and storage.")
(target "/dev/vda"))) (target "/dev/vda")))
(kernel-arguments '("console=ttyS0")) (kernel-arguments '("console=ttyS0"))
(file-systems (cons (file-system (file-systems (cons (file-system
(device "my-root") (device (file-system-label "my-root"))
(title 'label)
(mount-point "/") (mount-point "/")
(type "ext4")) (type "ext4"))
%base-file-systems)) %base-file-systems))
@ -428,13 +425,11 @@ reboot\n")
(target "/dev/vdb"))) (target "/dev/vdb")))
(kernel-arguments '("console=ttyS0")) (kernel-arguments '("console=ttyS0"))
(file-systems (cons* (file-system (file-systems (cons* (file-system
(device "my-root") (device (file-system-label "my-root"))
(title 'label)
(mount-point "/") (mount-point "/")
(type "ext4")) (type "ext4"))
(file-system (file-system
(device "none") (device "none")
(title 'device)
(type "tmpfs") (type "tmpfs")
(mount-point "/home") (mount-point "/home")
(type "tmpfs")) (type "tmpfs"))
@ -488,13 +483,11 @@ partition. In particular, home directories must be correctly created (see
(target "/dev/vdb"))) (target "/dev/vdb")))
(kernel-arguments '("console=ttyS0")) (kernel-arguments '("console=ttyS0"))
(file-systems (cons* (file-system (file-systems (cons* (file-system
(device "root-fs") (device (file-system-label "root-fs"))
(title 'label)
(mount-point "/") (mount-point "/")
(type "ext4")) (type "ext4"))
(file-system (file-system
(device "store-fs") (device (file-system-label "store-fs"))
(title 'label)
(mount-point "/gnu") (mount-point "/gnu")
(type "ext4")) (type "ext4"))
%base-file-systems)) %base-file-systems))
@ -574,8 +567,7 @@ where /gnu lives on a separate partition.")
(target "/dev/md0") (target "/dev/md0")
(type raid-device-mapping)))) (type raid-device-mapping))))
(file-systems (cons (file-system (file-systems (cons (file-system
(device "root-fs") (device (file-system-label "root-fs"))
(title 'label)
(mount-point "/") (mount-point "/")
(type "ext4") (type "ext4")
(dependencies mapped-devices)) (dependencies mapped-devices))
@ -658,7 +650,6 @@ by 'mdadm'.")
(type luks-device-mapping)))) (type luks-device-mapping))))
(file-systems (cons (file-system (file-systems (cons (file-system
(device "/dev/mapper/the-root-device") (device "/dev/mapper/the-root-device")
(title 'device)
(mount-point "/") (mount-point "/")
(type "ext4")) (type "ext4"))
%base-file-systems)) %base-file-systems))
@ -779,8 +770,7 @@ build (current-guix) and then store a couple of full system images.")
(target "/dev/vdb"))) (target "/dev/vdb")))
(kernel-arguments '("console=ttyS0")) (kernel-arguments '("console=ttyS0"))
(file-systems (cons (file-system (file-systems (cons (file-system
(device "my-root") (device (file-system-label "my-root"))
(title 'label)
(mount-point "/") (mount-point "/")
(type "btrfs")) (type "btrfs"))
%base-file-systems)) %base-file-systems))

9
tests/guix-system.sh
View File

@ -111,8 +111,7 @@ cat > "$tmpfile" <<EOF
(bootloader (GRUB-config (device "/dev/sdX"))) ; 9 (bootloader (GRUB-config (device "/dev/sdX"))) ; 9
(file-systems (cons (file-system (file-systems (cons (file-system
(device "root") (device (file-system-label "root"))
(title 'label)
(mount-point "/") (mount-point "/")
(type "ext4")) (type "ext4"))
%base-file-systems))) %base-file-systems)))
@ -140,8 +139,7 @@ OS_BASE='
(bootloader grub-bootloader) (bootloader grub-bootloader)
(device "/dev/sdX"))) (device "/dev/sdX")))
(file-systems (cons (file-system (file-systems (cons (file-system
(device "root") (device (file-system-label "root"))
(title (string->symbol "label"))
(mount-point "/") (mount-point "/")
(type "ext4")) (type "ext4"))
%base-file-systems)) %base-file-systems))
@ -213,8 +211,7 @@ make_user_config ()
(bootloader grub-bootloader) (bootloader grub-bootloader)
(device "/dev/sdX"))) (device "/dev/sdX")))
(file-systems (cons (file-system (file-systems (cons (file-system
(device "root") (device (file-system-label "root"))
(title 'label)
(mount-point "/") (mount-point "/")
(type "ext4")) (type "ext4"))
%base-file-systems)) %base-file-systems))

6
tests/system.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -27,8 +27,7 @@
(define %root-fs (define %root-fs
(file-system (file-system
(device "my-root") (device (file-system-label "my-root"))
(title 'label)
(mount-point "/") (mount-point "/")
(type "ext4"))) (type "ext4")))
@ -114,7 +113,6 @@
(inherit %os-with-mapped-device) (inherit %os-with-mapped-device)
(file-systems (cons (file-system (file-systems (cons (file-system
(device "/dev/mapper/my-luks-device") (device "/dev/mapper/my-luks-device")
(title 'device)
(mount-point "/") (mount-point "/")
(type "ext4")) (type "ext4"))
%base-file-systems))))) %base-file-systems)))))