diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-09-30 12:01:32 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-09-30 12:05:27 +0200 |
| commit | 79355ae3e84359716f5135cc7083e72246bc8bf9 (patch) | |
| tree | 6b61851e2153581578bb78ef0f177b8841ee5db7 /guix/scripts/system.scm | |
| parent | 39d6b9c99f297e14fc4f47f002be3d40556726be (diff) | |
| parent | 86d8f6d3efb8300a3354735cbf06be6c01e23243 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/scripts/system.scm')
| -rw-r--r-- | guix/scripts/system.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 953c6243ed..a2cd97ac1f 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -383,7 +383,8 @@ it atomically, and then run OS's activation script." (uuid->string root) root)) (kernel (boot-parameters-kernel params)) - (kernel-arguments (boot-parameters-kernel-arguments params))) + (kernel-arguments (boot-parameters-kernel-arguments params)) + (initrd (boot-parameters-initrd params))) (menu-entry (label (string-append label " (#" (number->string number) ", " @@ -391,10 +392,10 @@ it atomically, and then run OS's activation script." (linux kernel) (linux-arguments (cons* (string-append "--root=" root-device) - #~(string-append "--system=" #$system) - #~(string-append "--load=" #$system "/boot") + (string-append "--system=" system) + (string-append "--load=" system "/boot") kernel-arguments)) - (initrd #~(string-append #$system "/initrd")))))) + (initrd initrd))))) (let* ((numbers (generation-numbers profile)) (systems (map (cut generation-file-name profile <>) |