summaryrefslogtreecommitdiff
path: root/gnu/system
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-09-20 21:44:39 +0200
committerLudovic Courtès <ludo@gnu.org>2015-09-20 22:05:36 +0200
commitcc0e575a94a4e22a0bf2bf1b0c7b0514f1c1fbb5 (patch)
treee60e25cc56f7c12b869889ec486228656f5dd696 /gnu/system
parent7ee5db15bfa336bb0472669b29eeb2c3b99449b8 (diff)
linux-boot: Mount /dev as a devtmpfs from the start.
Suggested by Petter <petter@mykolab.ch> and Mark H Weaver <mhw@netris.org>. Reported by Duncan Keall <duncan@duncankeall.com>. Partly fixes <http://bugs.gnu.org/19190> by populating /dev/mapper early enough. * gnu/build/linux-boot.scm (mount-essential-file-systems): Mount /dev as a devtmpfs. (move-essential-file-systems): Add /dev. (mount-root-file-system): Mount /rw-root/dev as a devtmpfs instead of calling 'make-essential-device-nodes'. (boot-system): Remove call to 'make-essential-device-nodes'. * gnu/system/file-systems.scm (%devtmpfs-file-system): Remove. * doc/guix.texi (File Systems): Adjust accordingly.
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/file-systems.scm15
1 files changed, 1 insertions, 14 deletions
diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm
index b177f93398f..8155b273e35 100644
--- a/gnu/system/file-systems.scm
+++ b/gnu/system/file-systems.scm
@@ -47,7 +47,6 @@
47 %binary-format-file-system 47 %binary-format-file-system
48 %shared-memory-file-system 48 %shared-memory-file-system
49 %pseudo-terminal-file-system 49 %pseudo-terminal-file-system
50 %devtmpfs-file-system
51 %immutable-store 50 %immutable-store
52 %control-groups 51 %control-groups
53 %elogind-file-systems 52 %elogind-file-systems
@@ -186,17 +185,6 @@ UUID representation."
186 (type "binfmt_misc") 185 (type "binfmt_misc")
187 (check? #f))) 186 (check? #f)))
188 187
189(define %devtmpfs-file-system
190 ;; /dev as a 'devtmpfs' file system, needed for udev.
191 (file-system
192 (device "none")
193 (mount-point "/dev")
194 (type "devtmpfs")
195 (check? #f)
196
197 ;; Mount it from the initrd so /dev/pts & co. can then be mounted over it.
198 (needed-for-boot? #t)))
199
200(define %tty-gid 188(define %tty-gid
201 ;; ID of the 'tty' group. Allocate it statically to make it easy to refer 189 ;; ID of the 'tty' group. Allocate it statically to make it easy to refer
202 ;; to it from here and from the 'tty' group definitions. 190 ;; to it from here and from the 'tty' group definitions.
@@ -282,8 +270,7 @@ UUID representation."
282(define %base-file-systems 270(define %base-file-systems
283 ;; List of basic file systems to be mounted. Note that /proc and /sys are 271 ;; List of basic file systems to be mounted. Note that /proc and /sys are
284 ;; currently mounted by the initrd. 272 ;; currently mounted by the initrd.
285 (append (list %devtmpfs-file-system 273 (append (list %pseudo-terminal-file-system
286 %pseudo-terminal-file-system
287 %shared-memory-file-system 274 %shared-memory-file-system
288 %immutable-store) 275 %immutable-store)
289 %elogind-file-systems 276 %elogind-file-systems