From 50cb948f1c584344c63129e535c2fe7b54332a87 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 2 Jul 2017 16:38:06 +0200 Subject: install: Re-add /bin/sh. Reported by Divan Santana . /bin/sh had disappeared in commit 387e175492f960d7d86f34f3b2e43938fa72dbf3. * gnu/system/install.scm (%installation-services): Add 'special-files-service-type' instance. --- gnu/system/install.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/system/install.scm') diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 0a78d030dd..2c408c109a 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -277,7 +277,13 @@ You have been warned. Thanks for being so brave. ;; Since this is running on a USB stick with a unionfs as the root ;; file system, use an appropriate cache configuration. (nscd-service (nscd-configuration - (caches %nscd-minimal-caches)))))) + (caches %nscd-minimal-caches))) + + ;; Having /bin/sh is a good idea. In particular it allows Tramp + ;; connections to this system to work. + (service special-files-service-type + `(("/bin/sh" ,(file-append (canonical-package bash) + "/bin/sh"))))))) (define %issue ;; Greeting. -- cgit v1.2.3 From 6db571cbf0488a4c6a9f24de25a2f5619e59faa2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 29 Jun 2017 18:43:33 +0200 Subject: install: Drop redundant package after c0f5eee4b2cc737be222c4ba331d0. * gnu/system/install.scm (installation-os): Remove SHADOW. --- gnu/system/install.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/system/install.scm') diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 2c408c109a..d5d11371a3 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -347,7 +347,6 @@ Use Alt-F2 for documentation. (base-pam-services #:allow-empty-passwords? #t)) (packages (cons* (canonical-package glibc) ;for 'tzselect' & co. - shadow ;'passwd', for easy SSH access parted gptfdisk ddrescue grub ;mostly so xrefs to its manual work cryptsetup -- cgit v1.2.3 From 651de2bdb5fd451c50933dcf8d647d470d826261 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 10 Jul 2017 03:23:30 +0200 Subject: build, vm: Use "GuixSD" or "GUIXSD" as volume label. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/build/vm.scm (initialize-hard-disk): Use "GuixSD" as label. * gnu/system/install.scm (installation-os): Use "GuixSD" as label. * gnu/system/vm.scm (system-disk-image): Use "GuixSD" or "GUIXSD" as volume label. Co-authored-by: Ludovic Courtès --- gnu/build/vm.scm | 2 +- gnu/system/install.scm | 2 +- gnu/system/vm.scm | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu/system/install.scm') diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index e631e5a834..2d41c5756b 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -431,7 +431,7 @@ passing it a directory name where it is mounted." (lambda (port) (format port "insmod part_msdos~@ - search --set=root --label gnu-disk-image~@ + search --set=root --label GuixSD~@ configfile /boot/grub/grub.cfg~%"))) (display "creating EFI firmware image...") diff --git a/gnu/system/install.scm b/gnu/system/install.scm index d5d11371a3..f9aa7f6733 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -306,7 +306,7 @@ Use Alt-F2 for documentation. ;; the appropriate one. (cons* (file-system (mount-point "/") - (device "gnu-disk-image") + (device "GuixSD") (title 'label) (type "ext4")) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 3e722d0815..66a2448ceb 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -335,11 +335,17 @@ the image." system described by OS. Said image can be copied on a USB stick as is. When VOLATILE? is true, the root file system is made volatile; this is useful to USB sticks meant to be read-only." + (define normalize-label + ;; ISO labels are all-caps (case-insensitive), but since + ;; 'find-partition-by-label' is case-sensitive, make it all-caps here. + (if (string=? "iso9660" file-system-type) + string-upcase + identity)) (define root-label ;; Volume name of the root file system. Since we don't know which device ;; will hold it, we use the volume name to find it (using the UUID would ;; be even better, but somewhat less convenient.) - "gnu-disk-image") + (normalize-label "GuixSD")) (define file-systems-to-keep (remove (lambda (fs) -- cgit v1.2.3