diff options
| author | Leo Famulari <leo@famulari.name> | 2017-04-22 18:27:12 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-04-22 18:27:12 -0400 |
| commit | 1524851f58d8d69f6c6e1c6406cf174083bbe82d (patch) | |
| tree | d7c63b716501e4423e9f7173790a8cc4c3962935 /gnu/system.scm | |
| parent | 0802f3a034815576bf0e28c59c968400566b418b (diff) | |
| parent | ed9fb46b16cf7632e6df15c52c7183807fe5d1f9 (diff) | |
| download | guix-1524851f58d8d69f6c6e1c6406cf174083bbe82d.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 89c4150f99..44190bdfc6 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -73,7 +73,7 @@ operating-system-hosts-file operating-system-kernel operating-system-kernel-file - operating-system-kernel-arguments + operating-system-user-kernel-arguments operating-system-initrd operating-system-users operating-system-groups @@ -129,7 +129,7 @@ operating-system? (kernel operating-system-kernel ; package (default linux-libre)) - (kernel-arguments operating-system-kernel-arguments + (kernel-arguments operating-system-user-kernel-arguments (default '())) ; list of gexps/strings (bootloader operating-system-bootloader) ; <grub-configuration> @@ -278,7 +278,7 @@ value of the SYSTEM-SERVICE-TYPE service." (mlet %store-monad ((kernel -> (operating-system-kernel os)) (initrd (operating-system-initrd-file os)) - (params (operating-system-parameters-file os))) + (params (operating-system-boot-parameters-file os))) (return `(("kernel" ,kernel) ("parameters" ,params) ("initrd" ,initrd) @@ -385,7 +385,7 @@ explicitly appear in OS." ;; The packages below are also in %FINAL-INPUTS, so take them from ;; there to avoid duplication. (map canonical-package - (list guile-2.0 bash coreutils findutils grep sed + (list guile-2.0 bash coreutils-8.27 findutils grep sed diffutils patch gawk tar gzip bzip2 xz lzip)))) (define %default-issue @@ -756,7 +756,7 @@ populate the \"old entries\" menu." #~(string-append "--system=" #$system) #~(string-append "--load=" #$system "/boot") - (operating-system-kernel-arguments os))) + (operating-system-user-kernel-arguments os))) (initrd initrd))))) (grub-configuration-file (operating-system-bootloader os) entries #:old-entries old-entries))) @@ -769,7 +769,7 @@ device in a <menu-entry>." ((label) (file-system-device fs)) (else #f))) -(define (operating-system-parameters-file os) +(define (operating-system-boot-parameters-file os) "Return a file that describes the boot parameters of OS. The primary use of this file is the reconstruction of GRUB menu entries for old configurations." (mlet %store-monad ((initrd (operating-system-initrd-file os)) @@ -784,7 +784,7 @@ this file is the reconstruction of GRUB menu entries for old configurations." (root-device #$(file-system-device root)) (kernel #$(operating-system-kernel-file os)) (kernel-arguments - #$(operating-system-kernel-arguments os)) + #$(operating-system-user-kernel-arguments os)) (initrd #$initrd) (store (device #$(fs->boot-device store)) |