TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

system: Remove redundant gexp-ungexp usage.

Browse source 
* 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>
This commit is contained in:
Bruno Victal 2023-03-10 20:21:22 +00:00 committed by Ludovic Courtès
parent 02be907a12
commit 0f4a96ccd1
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gnu/system.scm
View file

@ -967,9 +967,8 @@ (define (validated-sudoers-file file)
"--check" "--file" #$file) "--check" "--file" #$file)
(copy-file #$file #$output))))) (copy-file #$file #$output)))))
(define (os-release) (define os-release
(plain-file "os-release" (plain-file "os-release" "\
"\
NAME=\"Guix System\" NAME=\"Guix System\"
ID=guix ID=guix
PRETTY_NAME=\"Guix System\" 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 source /run/current-system/profile/etc/profile.d/bash_completion.sh
fi\n"))) fi\n")))
(etc-service (etc-service
`(("os-release" ,#~#$(os-release)) `(("os-release" ,os-release)
("services" ,(file-append net-base "/etc/services")) ("services" ,(file-append net-base "/etc/services"))
("protocols" ,(file-append net-base "/etc/protocols")) ("protocols" ,(file-append net-base "/etc/protocols"))
("rpc" ,(file-append net-base "/etc/rpc")) ("rpc" ,(file-append net-base "/etc/rpc"))
("login.defs" ,#~#$login.defs) ("login.defs" ,login.defs)
("issue" ,#~#$issue) ("issue" ,issue)
,@(if nsswitch `(("nsswitch.conf" ,#~#$nsswitch)) '()) ,@(if nsswitch `(("nsswitch.conf" ,nsswitch)) '())
("profile" ,#~#$profile) ("profile" ,profile)
("bashrc" ,#~#$bashrc) ("bashrc" ,bashrc)
;; Write the operating-system-host-name to /etc/hostname to prevent ;; Write the operating-system-host-name to /etc/hostname to prevent
;; NetworkManager from changing the system's hostname when connecting ;; NetworkManager from changing the system's hostname when connecting
;; to certain networks. Some discussion at ;; to certain networks. Some discussion at