[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
85/155: services: Use 'file-append' in more places.
From: |
John Darrington |
Subject: |
85/155: services: Use 'file-append' in more places. |
Date: |
Wed, 21 Dec 2016 20:48:35 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 287d84e725e51dde2c45bde435138a572d19b21d
Author: Ludovic Courtès <address@hidden>
Date: Mon Dec 19 15:41:19 2016 +0100
services: Use 'file-append' in more places.
* gnu/services/avahi.scm (avahi-shepherd-service): Use #$(file-append x y)
instead of (string-append #$x y).
* gnu/services/base.scm (unicode-start)
(console-keymap-service-type, console-font-shepherd-services)
(mingetty-shepherd-service, nscd-shepherd-service)
(hydra-key-authorization, guix-shepherd-service)
(guix-publish-shepherd-service, udev-shepherd-service)
(gpm-shepherd-service, <kmscon-configuration>)
(kmscon-service-type): Likewise.
* gnu/services/shepherd.scm (shepherd-boot-gexp): Likewise.
---
gnu/services/avahi.scm | 2 +-
gnu/services/base.scm | 30 +++++++++++++++---------------
gnu/services/shepherd.scm | 2 +-
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/gnu/services/avahi.scm b/gnu/services/avahi.scm
index 60e9e61..2972041 100644
--- a/gnu/services/avahi.scm
+++ b/gnu/services/avahi.scm
@@ -107,7 +107,7 @@
(requirement '(dbus-system networking))
(start #~(make-forkexec-constructor
- (list (string-append #$avahi "/sbin/avahi-daemon")
+ (list #$(file-append avahi "/sbin/avahi-daemon")
"--daemonize"
#$@(if debug? #~("--debug") #~())
"-f" #$config)
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index ea1ab63..8e68689 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -610,7 +610,7 @@ strings or string-valued gexps."
(dup2 (open-fdes #$tty O_RDONLY) 0)
(close-fdes 1)
(dup2 (open-fdes #$tty O_WRONLY) 1)
- (execl (string-append #$kbd "/bin/unicode_start")
+ (execl #$(file-append kbd "/bin/unicode_start")
"unicode_start"))
(else
(zero? (cdr (waitpid pid))))))))
@@ -623,7 +623,7 @@ strings or string-valued gexps."
(documentation (string-append "Load console keymap (loadkeys)."))
(provision '(console-keymap))
(start #~(lambda _
- (zero? (system* (string-append #$kbd "/bin/loadkeys")
+ (zero? (system* #$(file-append kbd "/bin/loadkeys")
address@hidden))))
(respawn? #f)))))
@@ -655,7 +655,7 @@ strings or string-valued gexps."
(start #~(lambda _
(and #$(unicode-start device)
(zero?
- (system* (string-append #$kbd "/bin/setfont")
+ (system* #$(file-append kbd "/bin/setfont")
"-C" #$device #$font)))))
(stop #~(const #t))
(respawn? #f)))))
@@ -737,7 +737,7 @@ the message of the day, among other things."
(requirement '(user-processes host-name udev))
(start #~(make-forkexec-constructor
- (list (string-append #$mingetty "/sbin/mingetty")
+ (list #$(file-append mingetty "/sbin/mingetty")
"--noclear" #$tty
#$@(if auto-login
#~("--autologin" #$auto-login)
@@ -872,7 +872,7 @@ the tty to run, among other things."
(provision '(nscd))
(requirement '(user-processes))
(start #~(make-forkexec-constructor
- (list (string-append #$(nscd-configuration-glibc config)
+ (list #$(file-append (nscd-configuration-glibc config)
"/sbin/nscd")
"-f" #$nscd.conf "--foreground")
@@ -1058,7 +1058,7 @@ public key, with GUIX."
(format #t "registering public key '~a'...~%" key)
(close-port (current-input-port))
(dup port 0)
- (execl (string-append #$guix "/bin/guix")
+ (execl #$(file-append guix "/bin/guix")
"guix" "archive" "--authorize")
(exit 1)))
(else
@@ -1111,7 +1111,7 @@ failed to register hydra.gnu.org public key: ~a~%"
status))))))))
(requirement '(user-processes))
(start
#~(make-forkexec-constructor
- (list (string-append #$guix "/bin/guix-daemon")
+ (list #$(file-append guix "/bin/guix-daemon")
"--build-users-group" #$build-group
#$@(if use-substitutes?
'()
@@ -1186,7 +1186,7 @@ failed to register hydra.gnu.org public key: ~a~%"
status))))))))
(provision '(guix-publish))
(requirement '(guix-daemon))
(start #~(make-forkexec-constructor
- (list (string-append #$guix "/bin/guix")
+ (list #$(file-append guix "/bin/guix")
"publish" "-u" "guix-publish"
"-p" #$(number->string port)
(string-append "--listen=" #$host))))
@@ -1340,7 +1340,7 @@ item of @var{packages}."
;; The first one is for udev, the second one for eudev.
(setenv "UDEV_CONFIG_FILE" #$udev.conf)
(setenv "EUDEV_RULES_DIRECTORY"
- (string-append #$rules "/lib/udev/rules.d"))
+ #$(file-append rules "/lib/udev/rules.d"))
(let ((pid (primitive-fork)))
(case pid
@@ -1353,11 +1353,11 @@ item of @var{packages}."
(wait-for-udevd)
;; Trigger device node creation.
- (system* (string-append #$udev "/bin/udevadm")
+ (system* #$(file-append udev "/bin/udevadm")
"trigger" "--action=add")
;; Wait for things to settle down.
- (system* (string-append #$udev "/bin/udevadm")
+ (system* #$(file-append udev "/bin/udevadm")
"settle")
pid)))))
(stop #~(make-kill-destructor))
@@ -1428,7 +1428,7 @@ extra rules from the packages listed in @var{rules}."
;; 'gpm' runs in the background and sets a PID file.
;; Note that it requires running as "root".
(false-if-exception (delete-file "/var/run/gpm.pid"))
- (fork+exec-command (list (string-append #$gpm
"/sbin/gpm")
+ (fork+exec-command (list #$(file-append gpm "/sbin/gpm")
address@hidden))
;; Wait for the PID file to appear; declare failure if
@@ -1443,7 +1443,7 @@ extra rules from the packages listed in @var{rules}."
(stop #~(lambda (_)
;; Return #f if successfully stopped.
- (not (zero? (system* (string-append #$gpm "/sbin/gpm")
+ (not (zero? (system* #$(file-append gpm "/sbin/gpm")
"-k"))))))))))
(define gpm-service-type
@@ -1472,7 +1472,7 @@ This service is not part of @var{%base-services}."
(default kmscon))
(virtual-terminal kmscon-configuration-virtual-terminal)
(login-program kmscon-configuration-login-program
- (default #~(string-append #$shadow "/bin/login")))
+ (default (file-append shadow "/bin/login")))
(login-arguments kmscon-configuration-login-arguments
(default '("-p")))
(hardware-acceleration? kmscon-configuration-hardware-acceleration?
@@ -1490,7 +1490,7 @@ This service is not part of @var{%base-services}."
(define kmscon-command
#~(list
- (string-append #$kmscon "/bin/kmscon") "--login"
+ #$(file-append kmscon "/bin/kmscon") "--login"
"--vt" #$virtual-terminal
#$@(if hardware-acceleration? '("--hwaccel") '())
"--" #$login-program address@hidden))
diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm
index 3273184..d8d5006 100644
--- a/gnu/services/shepherd.scm
+++ b/gnu/services/shepherd.scm
@@ -82,7 +82,7 @@
(loop (+ 1 fd))))
;; Start shepherd.
- (execl (string-append #$shepherd "/bin/shepherd")
+ (execl #$(file-append shepherd "/bin/shepherd")
"shepherd" "--config" #$shepherd-conf)))))
(define shepherd-root-service-type
- 41/155: import cran: Add recursive importer., (continued)
- 41/155: import cran: Add recursive importer., John Darrington, 2016/12/21
- 67/155: build: Fix .service and .conf targets for VPATH builds., John Darrington, 2016/12/21
- 59/155: linux-initrd: Support FAT filesystems., John Darrington, 2016/12/21
- 55/155: gnu: emacs-org: Update to 20161214., John Darrington, 2016/12/21
- 64/155: doc: Document 'cargo-build-system'., John Darrington, 2016/12/21
- 63/155: gnu: mumble: Update to 1.2.18., John Darrington, 2016/12/21
- 68/155: gnu: maxima: Update to 5.39.0., John Darrington, 2016/12/21
- 65/155: doc: Mention the d3.js backend of 'guix graph'., John Darrington, 2016/12/21
- 71/155: gnu: gnuplot: Update to 5.0.5., John Darrington, 2016/12/21
- 83/155: doc: Make 'guix pull' more visible., John Darrington, 2016/12/21
- 85/155: services: Use 'file-append' in more places.,
John Darrington <=
- 93/155: gnu: linux-libre: Fix typo., John Darrington, 2016/12/21
- 91/155: gnu: Add python-xopen., John Darrington, 2016/12/21
- 100/155: gnu: utox: Fix description., John Darrington, 2016/12/21
- 82/155: doc: Mention 'swapon'., John Darrington, 2016/12/21
- 70/155: gnu: wxmaxima: Update to 16.12.0., John Darrington, 2016/12/21
- 37/155: import cran: Remove more invalid characters from package names., John Darrington, 2016/12/21
- 38/155: import cran: Move guix-name to top-level., John Darrington, 2016/12/21
- 43/155: guix import: Print list of expressions., John Darrington, 2016/12/21
- 51/155: gnu: Add attribution line for Raoul Bonnal., John Darrington, 2016/12/21
- 60/155: tests: Adjust cpan tests., John Darrington, 2016/12/21