guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/09: squash! gnu: hurd: Ensure startup scripts refer to the right prog


From: guix-commits
Subject: 02/09: squash! gnu: hurd: Ensure startup scripts refer to the right programs.
Date: Sun, 5 Apr 2020 11:30:15 -0400 (EDT)

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

commit db3021625439ec55a753a77eb9216714b6ca422f
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sun Apr 5 14:07:37 2020 +0200

    squash! gnu: hurd: Ensure startup scripts refer to the right programs.
    
    * gnu/packages/hurd.scm (hurd): MAKEDEV also needs coreutils (chown), sed.
---
 gnu/packages/hurd.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 2f6c13c..80c7b8c 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -363,7 +363,8 @@ boot, since this cannot be done from GNU/Linux."
                   (string-append out "/libexec/")))
 
                (substitute* '("daemons/runsystem.sh"
-                              "daemons/runsystem.hurd.sh")
+                              "daemons/runsystem.hurd.sh"
+                              "sutils/MAKEDEV.sh")
                  (("^PATH=.*")
                   (string-append "PATH=" out "/bin:" out "/sbin:"
                                  coreutils "/bin:"
@@ -376,9 +377,6 @@ boot, since this cannot be done from GNU/Linux."
                  ;; Let's try if writable / helps...
                  (("export PATH") (string-append "export PATH\n"
                                                  "mount -o remount,rw /")))
-               (substitute* "sutils/MAKEDEV.sh"
-                 (("^PATH=.*")
-                  (string-append "PATH=" out "/bin:" out "/sbin\n")))
                #t)))
          (add-after 'patch-shebangs 'patch-libexec-shebangs
            (lambda* (#:key inputs outputs #:allow-other-keys)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]