diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-12-05 17:57:35 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-12-05 17:57:35 +0100 |
| commit | 9d5aa009062a49bd035ae33e37f6562526e7d38c (patch) | |
| tree | 4ff2302863a5cf9f3cf604240ea793152156f532 /gnu/system | |
| parent | 60bd56c6d8368c23dcd97b26501771c82316fc8c (diff) | |
| parent | 2c2fc24b899d3286774f60405888718d98211213 (diff) | |
| download | guix-9d5aa009062a49bd035ae33e37f6562526e7d38c.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/install.scm | 11 | ||||
| -rw-r--r-- | gnu/system/vm.scm | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm index bdf114c180..4d1612ac7f 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -242,9 +242,6 @@ the user's target storage device rather than on the RAM disk." (define (/etc/configuration-files _) "Return a list of tuples representing configuration templates to add to /etc." - (define (file f) - (local-file (string-append "examples/" f))) - (define directory (computed-file "configuration-templates" (with-imported-modules '((guix build utils)) @@ -254,10 +251,10 @@ the user's target storage device rather than on the RAM disk." (copy-file file (string-append #$output "/" target))) - '(#$(file "bare-bones.tmpl") - #$(file "beaglebone-black.tmpl") - #$(file "desktop.tmpl") - #$(file "lightweight-desktop.tmpl")) + '(#$(local-file "examples/bare-bones.tmpl") + #$(local-file "examples/beaglebone-black.tmpl") + #$(local-file "examples/desktop.tmpl") + #$(local-file "examples/lightweight-desktop.tmpl")) '("bare-bones.scm" "beaglebone-black.scm" "desktop.scm" diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index c900b2d435..8609bd2ace 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -689,7 +689,7 @@ to USB sticks meant to be read-only." (initrd (lambda (file-systems . rest) (apply (operating-system-initrd os) file-systems - #:volatile-root? #t + #:volatile-root? volatile? rest))) (bootloader (if (string=? "iso9660" file-system-type) |