summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Victal <mirai@makinata.eu>2023-03-10 20:21:22 +0000
committerLudovic Courtès <ludo@gnu.org>2023-03-13 15:08:32 +0100
commit0f4a96ccd11115f7a1d8721aca7dc42e7a0a46c2 (patch)
treeddea253571f4565d033d4e95e5d9c654c1288d75
parent02be907a12dc291b02f6e895ca15f2fb20037185 (diff)
system: Remove redundant gexp-ungexp usage.
* gnu/system.scm (os-release): Convert to variable. (operating-system-etc-service): Remove redundant gexp-ungexps. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--gnu/system.scm17
1 files changed, 8 insertions, 9 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index 2947d1321f..887e537b48 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -967,9 +967,8 @@ syntactically correct."
"--check" "--file" #$file)
(copy-file #$file #$output)))))
-(define (os-release)
- (plain-file "os-release"
- "\
+(define os-release
+ (plain-file "os-release" "\
NAME=\"Guix System\"
ID=guix
PRETTY_NAME=\"Guix System\"
@@ -1092,15 +1091,15 @@ then
source /run/current-system/profile/etc/profile.d/bash_completion.sh
fi\n")))
(etc-service
- `(("os-release" ,#~#$(os-release))
+ `(("os-release" ,os-release)
("services" ,(file-append net-base "/etc/services"))
("protocols" ,(file-append net-base "/etc/protocols"))
("rpc" ,(file-append net-base "/etc/rpc"))
- ("login.defs" ,#~#$login.defs)
- ("issue" ,#~#$issue)
- ,@(if nsswitch `(("nsswitch.conf" ,#~#$nsswitch)) '())
- ("profile" ,#~#$profile)
- ("bashrc" ,#~#$bashrc)
+ ("login.defs" ,login.defs)
+ ("issue" ,issue)
+ ,@(if nsswitch `(("nsswitch.conf" ,nsswitch)) '())
+ ("profile" ,profile)
+ ("bashrc" ,bashrc)
;; Write the operating-system-host-name to /etc/hostname to prevent
;; NetworkManager from changing the system's hostname when connecting
;; to certain networks. Some discussion at