aboutsummaryrefslogtreecommitdiff
path: root/gnu/system/install.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-04-06 12:00:29 +0200
committerLudovic Courtès <ludo@gnu.org>2016-04-06 12:00:29 +0200
commit933d2fe4cfb380f66af631a2203ec23c367e5b1a (patch)
treef10581ed0da1911eed9b02e69d999ba481d9d3c6 /gnu/system/install.scm
parentf8835ff4b3dd59d59bf44838d05d3d60114d15d2 (diff)
parent998afc3608242b75051f43ece36d52474c51e285 (diff)
downloadpatches-933d2fe4cfb380f66af631a2203ec23c367e5b1a.tar
patches-933d2fe4cfb380f66af631a2203ec23c367e5b1a.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system/install.scm')
-rw-r--r--gnu/system/install.scm39
1 files changed, 28 insertions, 11 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index b380716b69..a94e3ab2d5 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -111,7 +111,7 @@ manual."
;; 'gunzip' is needed to decompress the doc.
(setenv "PATH" (string-append #$gzip "/bin"))
- (execl (string-append #$texinfo-4 "/bin/info") "info"
+ (execl (string-append #$info-reader "/bin/info") "info"
"-d" "/run/current-system/profile/share/info"
"-f" (string-append #$guix "/share/info/guix.info")
"-n" "System Installation"))))
@@ -215,9 +215,11 @@ the user's target storage device rather than on the RAM disk."
(string-append #$output "/"
target)))
'(#$(file "bare-bones.tmpl")
- #$(file "desktop.tmpl"))
+ #$(file "desktop.tmpl")
+ #$(file "lightweight-desktop.tmpl"))
'("bare-bones.scm"
- "desktop.scm"))
+ "desktop.scm"
+ "lightweight-desktop.scm"))
#t)
#:modules '((guix build utils))))
@@ -338,17 +340,33 @@ Use Alt-F2 for documentation.
(file-systems
;; Note: the disk image build code overrides this root file system with
;; the appropriate one.
- (cons (file-system
- (mount-point "/")
- (device "gnu-disk-image")
- (title 'label)
- (type "ext4"))
- %base-file-systems))
+ (cons* (file-system
+ (mount-point "/")
+ (device "gnu-disk-image")
+ (title 'label)
+ (type "ext4"))
+
+ ;; Make /tmp a tmpfs instead of keeping the unionfs. This is
+ ;; because FUSE creates '.fuse_hiddenXYZ' files for each open file,
+ ;; and this confuses Guix's test suite, for instance. See
+ ;; <http://bugs.gnu.org/23056>.
+ (file-system
+ (mount-point "/tmp")
+ (device "none")
+ (title 'device)
+ (type "tmpfs")
+ (check? #f))
+
+ ;; XXX: This should be %BASE-FILE-SYSTEMS but we don't need
+ ;; elogind's cgroup file systems.
+ (list %pseudo-terminal-file-system
+ %shared-memory-file-system
+ %immutable-store)))
(users (list (user-account
(name "guest")
(group "users")
- (supplementary-groups '("wheel")) ; allow use of sudo
+ (supplementary-groups '("wheel")) ; allow use of sudo
(password "")
(comment "Guest of GNU")
(home-directory "/home/guest"))))
@@ -366,7 +384,6 @@ Use Alt-F2 for documentation.
(base-pam-services #:allow-empty-passwords? #t))
(packages (cons* (canonical-package glibc) ;for 'tzselect' & co.
- texinfo-4 ;for the standalone Info reader
parted ddrescue
grub ;mostly so xrefs to its manual work
cryptsetup