ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

system: Set $LINUX_MODULE_DIRECTORY as a function or /run/booted-system.

Browse source 
* gnu/system.scm (etc-directory): Remove #:kernel parameter.  Set
  LINUX_MODULE_DIRECTORY as a function or /run/booted-system.
  (operating-system-etc-directory): Update accordingly.
This commit is contained in:
Ludovic Courtès 2014-06-29 22:02:42 +02:00
parent 0918e64a49
commit 62f0a4792b
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/system.scm
View file

@ -232,7 +232,6 @@ (define %default-issue
This is the GNU system. Welcome.\n") This is the GNU system. Welcome.\n")
(define* (etc-directory #:key (define* (etc-directory #:key
kernel
(locale "C") (timezone "Europe/Paris") (locale "C") (timezone "Europe/Paris")
(issue "Hello!\n") (issue "Hello!\n")
(skeletons '()) (skeletons '())
@ -260,9 +259,7 @@ (define* (etc-directory #:key
export TZDIR=\"" tzdata "/share/zoneinfo\" export TZDIR=\"" tzdata "/share/zoneinfo\"
# Tell 'modprobe' & co. where to look for modules. # Tell 'modprobe' & co. where to look for modules.
# XXX: The downside of doing it here is that when switching to a new config export LINUX_MODULE_DIRECTORY=/run/booted-system/kernel/lib/modules
# without rebooting, this variable possibly becomes invalid.
export LINUX_MODULE_DIRECTORY=" kernel "/lib/modules
export PATH=$HOME/.guix-profile/bin:/run/current-system/profile/bin export PATH=$HOME/.guix-profile/bin:/run/current-system/profile/bin
export PATH=/run/setuid-programs:/run/current-system/profile/sbin:$PATH export PATH=/run/setuid-programs:/run/current-system/profile/sbin:$PATH
@ -326,8 +323,7 @@ (define (operating-system-etc-directory os)
(append-map service-pam-services services)))) (append-map service-pam-services services))))
(profile-drv (operating-system-profile os)) (profile-drv (operating-system-profile os))
(skeletons (operating-system-skeletons os))) (skeletons (operating-system-skeletons os)))
(etc-directory #:kernel (operating-system-kernel os) (etc-directory #:pam-services pam-services
#:pam-services pam-services
#:skeletons skeletons #:skeletons skeletons
#:issue (operating-system-issue os) #:issue (operating-system-issue os)
#:locale (operating-system-locale os) #:locale (operating-system-locale os)