[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/07: squash! gnu: hurd: Ensure startup scripts refer to the right prog
From: |
guix-commits |
Subject: |
06/07: squash! gnu: hurd: Ensure startup scripts refer to the right programs. |
Date: |
Mon, 6 Apr 2020 13:33:25 -0400 (EDT) |
civodul pushed a commit to branch wip-hurd-vm
in repository guix.
commit 165c19387c0bf6d6e3d400618f39859095ae7763
Author: Ludovic Courtès <address@hidden>
AuthorDate: Mon Apr 6 16:06:36 2020 +0200
squash! gnu: hurd: Ensure startup scripts refer to the right programs.
---
gnu/packages/hurd.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 83a05dc..6f6b20e 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -364,6 +364,9 @@ boot, since this cannot be done from GNU/Linux."
(substitute* '("startup/startup.c" "init/init.c" "config/ttys")
(("/libexec/")
(string-append out "/libexec/")))
+ (substitute* "daemons/console-run.c"
+ (("/hurd/")
+ (string-append out "/hurd/")))
(substitute* '("daemons/runsystem.sh"
"daemons/runsystem.hurd.sh"
@@ -376,7 +379,8 @@ boot, since this cannot be done from GNU/Linux."
(("^SHELL=.*")
(string-append "SHELL=" bash "/bin/bash\n"))
(("/sbin/") (string-append out "/sbin/"))
- (("/libexec/") (string-append out "/libexec/")))
+ (("/libexec/") (string-append out "/libexec/"))
+ (("/hurd/") (string-append out "/hurd/")))
(substitute* '("daemons/runsystem.sh"
"daemons/runsystem.hurd.sh")
- branch wip-hurd-vm updated (3a6eb2c -> eef7e0f), guix-commits, 2020/04/06
- 01/07: squash! DRAFT: gnu: hurd: Provide our own /libexec/rc script., guix-commits, 2020/04/06
- 02/07: gnu: hurd: Install the UTF-8 motd., guix-commits, 2020/04/06
- 03/07: system: hurd: Create /etc/{hostname,motd,login} and /root., guix-commits, 2020/04/06
- 04/07: database: 'reset-timestamps' can optionally preserve permissions., guix-commits, 2020/04/06
- 05/07: vm: Preserve file permissions on /dev., guix-commits, 2020/04/06
- 06/07: squash! gnu: hurd: Ensure startup scripts refer to the right programs.,
guix-commits <=
- 07/07: linux-boot: 'make-essential-device-nodes' root parameter is optional., guix-commits, 2020/04/06