[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#28377] [PATCH 05/10] services: file-system: Use 'file-system->spec'
From: |
Ludovic Courtès |
Subject: |
[bug#28377] [PATCH 05/10] services: file-system: Use 'file-system->spec'. |
Date: |
Thu, 7 Sep 2017 00:17:51 +0200 |
* gnu/services/base.scm (file-system-shepherd-service): Use
'file-system->spec' instead of in-line code.
---
gnu/services/base.scm | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 23ef2d4bf..b8feb725d 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -29,6 +29,7 @@
#:use-module (gnu services networking)
#:use-module (gnu system pam)
#:use-module (gnu system shadow) ; 'user-account', etc.
+ #:use-module (gnu system uuid)
#:use-module (gnu system file-systems) ; 'file-system', etc.
#:use-module (gnu system mapped-devices)
#:use-module ((gnu system linux-initrd)
@@ -277,12 +278,6 @@ FILE-SYSTEM."
"Return the shepherd service for @var{file-system}, or @code{#f} if
@var{file-system} is not auto-mounted upon boot."
(let ((target (file-system-mount-point file-system))
- (device (file-system-device file-system))
- (type (file-system-type file-system))
- (title (file-system-title file-system))
- (flags (file-system-flags file-system))
- (options (file-system-options file-system))
- (check? (file-system-check? file-system))
(create? (file-system-create-mount-point? file-system))
(dependencies (file-system-dependencies file-system))
(packages (file-system-packages (list file-system))))
@@ -311,8 +306,7 @@ FILE-SYSTEM."
'#$packages))))
(lambda ()
(mount-file-system
- `(#$device #$title #$target #$type #$flags
- #$options #$check?)
+ '#$(file-system->spec file-system)
#:root "/"))
(lambda ()
(setenv "PATH" $PATH)))
--
2.14.1
- [bug#28377] [PATCH 08/10] uuid: 'uuid' macro supports more UUID types., (continued)
- [bug#28377] [PATCH 06/10] system: Introduce a disjoint UUID type., Ludovic Courtès, 2017/09/06
- [bug#28377] [PATCH 04/10] file-systems: Introduce (gnu system uuid)., Ludovic Courtès, 2017/09/06
- [bug#28377] [PATCH 03/10] services: base: Import the closure of (gnu build file-systems)., Ludovic Courtès, 2017/09/06
- [bug#28377] [PATCH 05/10] services: file-system: Use 'file-system->spec'.,
Ludovic Courtès <=
- [bug#28377] [PATCH 10/10] vm: Generate a UUID to identify the root file system., Ludovic Courtès, 2017/09/06
- [bug#28377] [PATCH 07/10] system: Serialize the UUID type in the "parameters" file., Ludovic Courtès, 2017/09/06