summaryrefslogtreecommitdiff
path: root/gnu/system/hurd.scm
diff options
context:
space:
mode:
authorJan (janneke) Nieuwenhuizen <janneke@gnu.org>2020-04-08 08:04:52 +0200
committerLudovic Courtès <ludo@gnu.org>2020-04-11 21:01:09 +0200
commitda987ece8f9a4ecb6d1d40b042da2c829367f059 (patch)
tree34271b59aad5bac9c87bd2bad73f585cb4b18a66 /gnu/system/hurd.scm
parent5fbf4f85e1bfe028cc17d6fbcd9e337bf7a9e389 (diff)
system: hurd: Add root profile.
* gnu/system/hurd.scm (%base-packages/hurd): New variable. (cross-hurd-image)[for-hurd]: New function. (cross-hurd-image)[hurd-os]: Use them. (cross-hurd-image)[profile]: Hack'y .profile for root, only setting PATH.
Diffstat (limited to 'gnu/system/hurd.scm')
-rw-r--r--gnu/system/hurd.scm59
1 files changed, 37 insertions, 22 deletions
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index 75b9dacd68..7cf7476bd1 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -23,6 +23,8 @@
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages cross-base)
+ #:use-module (gnu packages file)
+ #:use-module (gnu packages guile)
#:use-module (gnu packages hurd)
#:use-module (gnu system vm)
#:export (cross-hurd-image))
@@ -34,18 +36,20 @@
;;;
;;; Code:
+(define %base-packages/hurd
+ (list hurd bash coreutils file findutils grep sed guile-3.0))
+
(define* (cross-hurd-image #:key (hurd hurd) (gnumach gnumach))
"Return a cross-built GNU/Hurd image."
+
+ (define (for-hurd p)
+ (with-parameters ((%current-target-system "i586-pc-gnu")) p))
+
(define hurd-os
- (let-syntax ((for-hurd (syntax-rules ()
- ((_ things ...)
- (list (with-parameters ((%current-target-system
- "i586-pc-gnu"))
- things) ...)))))
- (directory-union "gnu+hurd"
- (cons (with-parameters ((%current-system "i686-linux"))
- gnumach)
- (for-hurd hurd bash coreutils grep sed)))))
+ (directory-union "gnu+hurd"
+ (cons (with-parameters ((%current-system "i686-linux"))
+ gnumach)
+ (map for-hurd %base-packages/hurd))))
(define grub.cfg
(let ((hurd (with-parameters ((%current-target-system "i586-pc-gnu"))
@@ -73,9 +77,20 @@ menuentry \"GNU\" {
#+mach #+mach #+hurd
#+libc #+hurd))))))
+ (define profile
+ (let ((packages (map for-hurd %base-packages/hurd)))
+ (computed-file
+ "profile"
+ #~(call-with-output-file #$output
+ (lambda (port)
+ (format port "
+PATH=~a/bin:~a/sbin:~a/hurd
+"
+ #+hurd-os #+hurd-os #+hurd-os))))))
+
(define fstab
(plain-file "fstab"
-"# This file was generated from your Guix configuration. Any changes
+ "# This file was generated from your Guix configuration. Any changes
# will be lost upon reboot or reconfiguration.
/dev/hd0s1 / ext2 defaults
@@ -83,15 +98,13 @@ menuentry \"GNU\" {
(define passwd
(plain-file "passwd"
-"root:x:0:0:root:/root:/bin/sh
-"
-))
+ "root:x:0:0:root:/root:/bin/sh
+"))
(define shadow
(plain-file "shadow"
-"root::0:0:0:0:::
-"
-))
+ "root::0:0:0:0:::
+"))
(define hurd-directives
`((directory "/servers")
@@ -109,7 +122,7 @@ menuentry \"GNU\" {
("/servers/socket/inet" -> "2")
("/servers/socket/inet6" -> "16")
(directory "/boot")
- ("/boot/grub.cfg" -> ,grub.cfg) ;XXX: not strictly needed
+ ("/boot/grub.cfg" -> ,grub.cfg) ;XXX: not strictly needed
("/hurd" -> ,(file-append (with-parameters ((%current-target-system
"i586-pc-gnu"))
hurd)
@@ -117,6 +130,7 @@ menuentry \"GNU\" {
;; TODO: Create those during activation, eventually.
(directory "/root")
+ ("/root/.profile" -> ,profile)
("/etc/fstab" -> ,fstab)
("/etc/passwd" -> ,passwd)
("/etc/shadow" -> ,shadow)
@@ -129,16 +143,16 @@ menuentry \"GNU\" {
hurd)
"/etc/motd"))
("/etc/login" -> ,(file-append (with-parameters ((%current-target-system
- "i586-pc-gnu"))
- hurd)
+ "i586-pc-gnu"))
+ hurd)
"/etc/login"))
;; XXX can we instead, harmlessly set _PATH_TTYS (from glibc) in runttys.c?
("/etc/ttys" -> ,(file-append (with-parameters ((%current-target-system
- "i586-pc-gnu"))
- hurd)
- "/etc/ttys"))
+ "i586-pc-gnu"))
+ hurd)
+ "/etc/ttys"))
("/bin/sh" -> ,(file-append (with-parameters ((%current-target-system
"i586-pc-gnu"))
bash)
@@ -151,6 +165,7 @@ menuentry \"GNU\" {
("grub.cfg" ,grub.cfg)
("fstab" ,fstab)
("passwd" ,passwd)
+ ("profile" ,profile)
("shadow" ,shadow))
#:copy-inputs? #t
#:os hurd-os