[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#40770] [PATCH 2/5] system: 'operating-system-directory-base-entries
From: |
Ludovic Courtès |
Subject: |
[bug#40770] [PATCH 2/5] system: 'operating-system-directory-base-entries' uses 'profile'. |
Date: |
Wed, 22 Apr 2020 17:08:46 +0200 |
* gnu/system.scm (operating-system-directory-base-entries): Use a
declarative profile instead of 'profile-derivation'.
---
gnu/system.scm | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index fb48fedd7f..739b629367 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -475,17 +475,15 @@ OS."
(define* (operating-system-directory-base-entries os)
"Return the basic entries of the 'system' directory of OS for use as the
value of the SYSTEM-SERVICE-TYPE service."
- (let ((locale (operating-system-locale-directory os)))
- (mlet* %store-monad ((kernel -> (operating-system-kernel os))
- (modules ->
- (operating-system-kernel-loadable-modules os))
- (kernel
- (profile-derivation
- (packages->manifest
- (cons kernel modules))
- #:hooks (list linux-module-database)))
- (initrd -> (operating-system-initrd-file os))
- (params -> (operating-system-boot-parameters-file
os)))
+ (let* ((locale (operating-system-locale-directory os))
+ (modules (operating-system-kernel-loadable-modules os))
+ (kernel (profile
+ (content (packages->manifest
+ (cons (operating-system-kernel os) modules)))
+ (hooks (list linux-module-database))))
+ (initrd (operating-system-initrd-file os))
+ (params (operating-system-boot-parameters-file os)))
+ (with-monad %store-monad
(return `(("kernel" ,kernel)
("parameters" ,params)
("initrd" ,initrd)
--
2.26.0