diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-09-13 21:28:01 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-09-13 21:28:01 +0200 |
| commit | 75710da66710cef1d32053cd8f350d13057d02a7 (patch) | |
| tree | abef6a326c741b1eb18db866b2f2bacee3e5fc51 /gnu/system | |
| parent | ab20c2cc33063ce783515d8ae7899ec7e2ca6f96 (diff) | |
| parent | 610075f7c94c80b8321887b7ccf8bb1a7edd2b8e (diff) | |
| download | patches-75710da66710cef1d32053cd8f350d13057d02a7.tar patches-75710da66710cef1d32053cd8f350d13057d02a7.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/file-systems.scm | 22 | ||||
| -rw-r--r-- | gnu/system/install.scm | 2 | ||||
| -rw-r--r-- | gnu/system/locale.scm | 2 |
3 files changed, 25 insertions, 1 deletions
diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index 003eb443d1..b177f93398 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -50,6 +50,7 @@ %devtmpfs-file-system %immutable-store %control-groups + %elogind-file-systems %base-file-systems %container-file-systems @@ -258,6 +259,26 @@ UUID representation." '("cpuset" "cpu" "cpuacct" "memory" "devices" "freezer" "blkio" "perf_event" "hugetlb"))))) +(define %elogind-file-systems + ;; We don't use systemd, but these file systems are needed for elogind, + ;; which was extracted from systemd. + (list (file-system + (device "none") + (mount-point "/run/systemd") + (type "tmpfs") + (check? #f) + (flags '(no-suid no-dev no-exec)) + (options "mode=0755") + (create-mount-point? #t)) + (file-system + (device "none") + (mount-point "/run/user") + (type "tmpfs") + (check? #f) + (flags '(no-suid no-dev no-exec)) + (options "mode=0755") + (create-mount-point? #t)))) + (define %base-file-systems ;; List of basic file systems to be mounted. Note that /proc and /sys are ;; currently mounted by the initrd. @@ -265,6 +286,7 @@ UUID representation." %pseudo-terminal-file-system %shared-memory-file-system %immutable-store) + %elogind-file-systems %control-groups)) ;; File systems for Linux containers differ from %base-file-systems in that diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 880236861e..c161526d77 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -349,7 +349,7 @@ Use Alt-F2 for documentation. parted ddrescue grub ;mostly so xrefs to its manual work cryptsetup - wireless-tools iw wpa-supplicant-light iproute + wireless-tools iw wpa-supplicant-minimal iproute ;; XXX: We used to have GNU fdisk here, but as of version ;; 2.0.0a, that pulls Guile 1.8, which takes unreasonable ;; space; furthermore util-linux's fdisk is already diff --git a/gnu/system/locale.scm b/gnu/system/locale.scm index be9abcb81d..393dd42354 100644 --- a/gnu/system/locale.scm +++ b/gnu/system/locale.scm @@ -83,6 +83,8 @@ (letrec-syntax ((utf8-locale (syntax-rules () ((_ name*) (locale-definition + ;; Note: We choose "utf8", which is the + ;; "normalized codeset". (name (string-append name* ".utf8")) (source name*) (charset "UTF-8"))))) |