aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Kost <alezost@gmail.com>2016-01-27 17:48:55 +0300
committerAlex Kost <alezost@gmail.com>2016-01-29 20:20:19 +0300
commitb8c02c18b47f79f3410f76cb03d9690e6fd1a15e (patch)
tree9f065acab68b8461253ea61f3a2590cf0cfa5ae9
parent34044d551f84cd5cd2568145f4ad3eaf690154ba (diff)
downloadguix-b8c02c18b47f79f3410f76cb03d9690e6fd1a15e.tar
guix-b8c02c18b47f79f3410f76cb03d9690e6fd1a15e.tar.gz
Rename '/root/etc/dmd' directory and 'do-not-kill' file.
* gnu/services/base.scm (%do-not-kill-file): Rename to "/etc/shepherd/do-not-kill". * gnu/build/linux-boot.scm (mount-root-file-system): Rename "/root/etc/dmd" to "/root/etc/shepherd".
-rw-r--r--gnu/build/linux-boot.scm8
-rw-r--r--gnu/services/base.scm2
2 files changed, 5 insertions, 5 deletions
diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index 0fc90af6a3..c34a3f7c18 100644
--- a/gnu/build/linux-boot.scm
+++ b/gnu/build/linux-boot.scm
@@ -242,10 +242,10 @@ the last argument of `mknod'."
is true, mount ROOT read-only and make it a union with a writable tmpfs using
UNIONFS."
(define (mark-as-not-killable pid)
- ;; Tell the 'user-processes' dmd service that PID must be kept alive when
- ;; shutting down.
- (mkdir-p "/root/etc/dmd")
- (let ((port (open-file "/root/etc/dmd/do-not-kill" "a")))
+ ;; Tell the 'user-processes' shepherd service that PID must be kept alive
+ ;; when shutting down.
+ (mkdir-p "/root/etc/shepherd")
+ (let ((port (open-file "/root/etc/shepherd/do-not-kill" "a")))
(chmod port #o600)
(write pid port)
(newline port)
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index fbb29c1ee2..6483a66b5a 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -325,7 +325,7 @@ in KNOWN-MOUNT-POINTS when it is stopped."
(define %do-not-kill-file
;; Name of the file listing PIDs of processes that must survive when halting
;; the system. Typical example is user-space file systems.
- "/etc/dmd/do-not-kill")
+ "/etc/shepherd/do-not-kill")
(define user-processes-service-type
(dmd-service-type