[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#62103] [PATCH 2/2] system: Remove redundant gexp-ungexp usage.
From: |
Bruno Victal |
Subject: |
[bug#62103] [PATCH 2/2] system: Remove redundant gexp-ungexp usage. |
Date: |
Fri, 10 Mar 2023 20:21:22 +0000 |
* gnu/system.scm (os-release): Convert to variable.
(operating-system-etc-service): Remove redundant gexp-ungexps.
---
gnu/system.scm | 17 ++++++++---------
1 file 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 @@ (define (validated-sudoers-file file)
"--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 @@ (define* (operating-system-etc-service os)
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
--
2.39.1