diff options
| author | Marius Bakke <marius@gnu.org> | 2020-06-11 23:30:32 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-06-11 23:30:32 +0200 |
| commit | 9b043df7403a10b35b93d133aac796fd277a7339 (patch) | |
| tree | f712922d9348ececc0d84e360ac653df3b8d2473 /gnu/system.scm | |
| parent | d79ec4fd343bc2a72652aa3a4b4ae14bd8df88ac (diff) | |
| parent | 648ae62112f62bc2106fb36d45c83fda787d3bed (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 21d0fbd190..d51691fe76 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -400,7 +400,7 @@ The object has its kernel-arguments extended in order to make it bootable." (device (boot-parameters-store-device conf)) (device-mount-point (boot-parameters-store-mount-point conf)) (linux (and (not multiboot?) kernel)) - (linux-arguments (if (not multiboot?) ' + (linux-arguments (if (not multiboot?) (boot-parameters-kernel-arguments conf) '())) (initrd (boot-parameters-initrd conf)) @@ -847,7 +847,8 @@ fi\n"))) ,@(if sudoers `(("sudoers" ,sudoers)) '()) ,@(if hurd `(("login" ,(file-append hurd "/etc/login")) - ("motd" ,(file-append hurd "/etc/motd"))) + ("motd" ,(file-append hurd "/etc/motd")) + ("ttys" ,(file-append hurd "/etc/ttys"))) '()))))) (define %root-account |