Revert "system: Add a 'needed-for-boot?' field to 'mapped-device'."

This reverts commit 3b09332adf7ce8e976a4d117a62c586a53af04aa, which
turned out to be a bad idea because we need to have dependency
information between the device-mapping service and the file-system
service that uses it.

3 files changed, 18 insertions, 20 deletions

diff --git a/doc/guix.texi b/doc/guix.texi
index 53bfb293b6..7c059b923a 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -3837,27 +3837,19 @@ detailed below.
 Objects of this type represent device mappings that will be made when
 the system boots up.
 
-@table @asis
-@item @code{source}
+@table @code
+@item source
 This string specifies the name of the block device to be mapped, such as
 @code{"/dev/sda3"}.
 
-@item @code{target}
+@item target
 This string specifies the name of the mapping to be established.  For
 example, specifying @code{"my-partition"} will lead to the creation of
 the @code{"/dev/mapper/my-partition"} device.
 
-@item @code{type}
+@item type
 This must be a @code{mapped-device-kind} object, which specifies how
 @var{source} is mapped to @var{target}.
-
-@item @code{needed-for-boot?} (default: @code{#f})
-This Boolean value indicates whether the device mapping must be made at
-boot time---i.e., from the initial RAM disk, before any user file
-systems are mounted.
-
-You would set it to @code{#t} for instance when the mapped device is
-used by the root file system.
 @end table
 @end deftp
 
diff --git a/gnu/system.scm b/gnu/system.scm
index 731f9de55f..e1ed1a2f19 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -250,14 +250,23 @@ as 'needed-for-boot'."
 (define (operating-system-user-mapped-devices os)
   "Return the subset of mapped devices that can be installed in
 user-land--i.e., those not needed during boot."
-  (remove mapped-device-needed-for-boot?
-          (operating-system-mapped-devices os)))
+  (let ((devices      (operating-system-mapped-devices os))
+        (file-systems (operating-system-file-systems os)))
+   (filter (lambda (md)
+             (let ((user (mapped-device-user md file-systems)))
+               (or (not user)
+                   (not (file-system-needed-for-boot? user)))))
+           devices)))
 
 (define (operating-system-boot-mapped-devices os)
   "Return the subset of mapped devices that must be installed during boot,
 from the initrd."
-  (filter mapped-device-needed-for-boot?
-          (operating-system-mapped-devices os)))
+  (let ((devices      (operating-system-mapped-devices os))
+        (file-systems (operating-system-file-systems os)))
+   (filter (lambda (md)
+             (let ((user (mapped-device-user md file-systems)))
+               (and user (file-system-needed-for-boot? user))))
+           devices)))
 
 (define (device-mapping-services os)
   "Return the list of device-mapping services for OS as a monadic list."
diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm
index 356b4826b4..4760821840 100644
--- a/gnu/system/file-systems.scm
+++ b/gnu/system/file-systems.scm
@@ -45,7 +45,6 @@
             mapped-device-source
             mapped-device-target
             mapped-device-type
-            mapped-device-needed-for-boot?
 
             mapped-device-kind
             mapped-device-kind?
@@ -158,9 +157,7 @@ file system."
   mapped-device?
   (source    mapped-device-source)                ;string
   (target    mapped-device-target)                ;string
-  (type      mapped-device-type)                  ;<mapped-device-kind>
-  (needed-for-boot? mapped-device-needed-for-boot? ;Boolean
-                    (default #f)))
+  (type      mapped-device-type))                 ;<mapped-device-kind>
 
 (define-record-type* <mapped-device-type> mapped-device-kind
   make-mapped-device-kind