diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-07-19 18:12:34 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-07-19 18:12:34 -0400 |
| commit | 1b4e48d498a96d478baa1aae7d9c7ecdbd817d6f (patch) | |
| tree | 4b650999e49a6f4d3dd116fab3f9ee8222247e07 /gnu/system.scm | |
| parent | aa27987f71cb8afa698ede551e20b1248f160113 (diff) | |
| parent | 50c7a1e297bff0935674b4f30e854a8889becfdd (diff) | |
| download | guix-1b4e48d498a96d478baa1aae7d9c7ecdbd817d6f.tar guix-1b4e48d498a96d478baa1aae7d9c7ecdbd817d6f.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index efad14596a..cf9ee123c7 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -68,6 +68,7 @@ operating-system-host-name operating-system-hosts-file operating-system-kernel + operating-system-kernel-arguments operating-system-initrd operating-system-users operating-system-groups @@ -103,6 +104,8 @@ operating-system? (kernel operating-system-kernel ; package (default linux-libre)) + (kernel-arguments operating-system-kernel-arguments + (default '())) ; list of gexps/strings (bootloader operating-system-bootloader) ; <grub-configuration> (initrd operating-system-initrd ; (list fs) -> M derivation @@ -225,10 +228,16 @@ as 'needed-for-boot'." (operating-system-mapped-devices os))) (define (requirements fs) - (map (lambda (md) - (symbol-append 'device-mapping- - (string->symbol (mapped-device-target md)))) - (device-mappings fs))) + ;; XXX: Fiddling with dmd service names is not nice. + (append (map (lambda (fs) + (symbol-append 'file-system- + (string->symbol + (file-system-mount-point fs)))) + (file-system-dependencies fs)) + (map (lambda (md) + (symbol-append 'device-mapping- + (string->symbol (mapped-device-target md)))) + (device-mappings fs)))) (sequence %store-monad (map (lambda (fs) @@ -866,11 +875,12 @@ listed in OS. The C library expects to find it under (label (kernel->grub-label kernel)) (linux kernel) (linux-arguments - (list (string-append "--root=" - (file-system-device root-fs)) - #~(string-append "--system=" #$system) - #~(string-append "--load=" #$system - "/boot"))) + (cons* (string-append "--root=" + (file-system-device root-fs)) + #~(string-append "--system=" #$system) + #~(string-append "--load=" #$system + "/boot") + (operating-system-kernel-arguments os))) (initrd #~(string-append #$system "/initrd")))))) (grub-configuration-file (operating-system-bootloader os) entries #:old-entries old-entries))) @@ -887,6 +897,8 @@ this file is the reconstruction of GRUB menu entries for old configurations." (label #$label) (root-device #$(file-system-device root)) (kernel #$(operating-system-kernel os)) + (kernel-arguments + #$(operating-system-kernel-arguments os)) (initrd #$initrd))))) (define (operating-system-derivation os) |