aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-02-01 12:30:56 +0100
committerLudovic Courtès <ludo@gnu.org>2017-02-01 12:36:41 +0100
commit357db1f91de9b3eb14be52a98cc804cdfd284f6d (patch)
treef167ad4bddf61597911f9da6a23fd88e12cf1a4e
parentae763b5b0b7d5e7316a3d0efe991fe8ab2261031 (diff)
downloadpatches-357db1f91de9b3eb14be52a98cc804cdfd284f6d.tar
patches-357db1f91de9b3eb14be52a98cc804cdfd284f6d.tar.gz
system: More 'file-append' instead of #~(string-append #$thing …).
* gnu/system/shadow.scm (<user-account>)[shell]: Use 'file-append'. (%base-user-accounts): Likewise. * gnu/system/grub.scm (%background-image): Likewise.
-rw-r--r--gnu/system/grub.scm4
-rw-r--r--gnu/system/shadow.scm4
2 files changed, 4 insertions, 4 deletions
diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm
index 067b291a5c..7df7d4615a 100644
--- a/gnu/system/grub.scm
+++ b/gnu/system/grub.scm
@@ -94,8 +94,8 @@ denoting a file name."
(define %background-image
(grub-image
(aspect-ratio 4/3)
- (file #~(string-append #$%artwork-repository
- "/grub/GuixSD-fully-black-4-3.svg"))))
+ (file (file-append %artwork-repository
+ "/grub/GuixSD-fully-black-4-3.svg"))))
(define %default-theme
;; Default theme contributed by Felipe López.
diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm
index ee9d55c157..1acfcc4866 100644
--- a/gnu/system/shadow.scm
+++ b/gnu/system/shadow.scm
@@ -84,7 +84,7 @@
(create-home-directory? user-account-create-home-directory? ;Boolean
(default #t))
(shell user-account-shell ; gexp
- (default #~(string-append #$bash "/bin/bash")))
+ (default (file-append bash "/bin/bash")))
(system? user-account-system? ; Boolean
(default #f)))
@@ -131,7 +131,7 @@
(name "nobody")
(uid 65534)
(group "nogroup")
- (shell #~(string-append #$shadow "/sbin/nologin"))
+ (shell (file-append shadow "/sbin/nologin"))
(home-directory "/nonexistent")
(create-home-directory? #f)
(system? #t))))