[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#26544: [PATCH v2 7/8] system: Use operating-system-boot-parameters d
From: |
Mathieu Othacehe |
Subject: |
bug#26544: [PATCH v2 7/8] system: Use operating-system-boot-parameters directly. |
Date: |
Fri, 21 Apr 2017 11:02:17 +0200 |
User-agent: |
mu4e 0.9.18; emacs 25.2.1 |
LGTM!
> * gnu/system.scm (operating-system-bootcfg): Use
> operating-system-boot-parameters directly.
> ---
> gnu/system.scm | 28 ++++------------------------
> 1 file changed, 4 insertions(+), 24 deletions(-)
>
> diff --git a/gnu/system.scm b/gnu/system.scm
> index cb166c755..013bd5356 100644
> --- a/gnu/system.scm
> +++ b/gnu/system.scm
> @@ -750,33 +750,13 @@ populate the \"old entries\" menu."
> (mlet* %store-monad
> ((system (operating-system-derivation os))
> (root-fs -> (operating-system-root-file-system os))
> - (store-fs -> (operating-system-store-file-system os))
> - (label -> (kernel->boot-label (operating-system-kernel os)))
> - (kernel -> (operating-system-kernel-file os))
> - (initrd (operating-system-initrd-file os))
> (root-device -> (if (eq? 'uuid (file-system-title root-fs))
> (uuid->string (file-system-device root-fs))
> (file-system-device root-fs)))
> - (entries -> (list (menu-entry
> - (label label)
> -
> - ;; The device where the kernel and initrd live.
> - (device (fs->boot-device store-fs))
> - (device-mount-point
> - (file-system-mount-point store-fs))
> -
> - (linux kernel)
> - (linux-arguments
> - (cons* (string-append "--root=" root-device)
> - #~(string-append "--system=" #$system)
> - #~(string-append "--load=" #$system
> - "/boot")
> - (operating-system-kernel-arguments os
> - system
> -
> root-device)))
> - (initrd initrd)))))
> - (grub-configuration-file (operating-system-bootloader os) entries
> - #:old-entries old-entries)))
> + (entry (operating-system-boot-parameters os system root-device)))
> + (grub-configuration-file (operating-system-bootloader os)
> + (list entry)
> + #:old-entries old-entries)))
>
> (define (fs->boot-device fs)
> "Given FS, a <file-system> object, return a value suitable for use as the
- bug#26544: [PATCH v2 2/8] system: Rename operating-system-parameters-file to operating-system-boot-parameters-file., (continued)
- bug#26544: [PATCH v2 6/8] system: vm: Use operating-system-kernel-arguments., Danny Milosavljevic, 2017/04/20
- bug#26544: [PATCH v2 1/8] system: Rename operating-system-kernel-arguments to operating-system-user-kernel-arguments., Danny Milosavljevic, 2017/04/20
- bug#26544: [PATCH v2 4/8] system: Introduce operating-system-kernel-arguments and use it., Danny Milosavljevic, 2017/04/20
- bug#26544: [PATCH v2 7/8] system: Use operating-system-boot-parameters directly., Danny Milosavljevic, 2017/04/20
- bug#26544: [PATCH v2 7/8] system: Use operating-system-boot-parameters directly.,
Mathieu Othacehe <=
- bug#26544: [PATCH v2 3/8] system: Factorize operating-system-boot-parameters-file., Danny Milosavljevic, 2017/04/20
- bug#26544: [PATCH v2 5/8] system: Introduce read-boot-parameters-file., Danny Milosavljevic, 2017/04/20
- bug#26544: [PATCH v2 8/8] system: grub: Use boot-parameters instead of menu-entry where possible., Danny Milosavljevic, 2017/04/20
- bug#26544: [PATCH v2 0/8] system: Move "--load" and other guix-specific parameters from the grub module to the generic system module., Mathieu Othacehe, 2017/04/21