summaryrefslogtreecommitdiff
path: root/gnu/system.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-06-29 22:02:42 +0200
committerLudovic Courtès <ludo@gnu.org>2014-06-29 22:02:42 +0200
commit62f0a4792b89a0a734a06ad5667ae109ef4b4d83 (patch)
tree136c51bf86e89f0239dfdadce9092be0904f97bc /gnu/system.scm
parent0918e64a49a2faa87ac9a5afb299f859d4be0cf0 (diff)
system: Set $LINUX_MODULE_DIRECTORY as a function or /run/booted-system.
* 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.
Diffstat (limited to 'gnu/system.scm')
-rw-r--r--gnu/system.scm8
1 files changed, 2 insertions, 6 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index 661bf4cc52..812d7c5d56 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -232,7 +232,6 @@ explicitly appear in OS."
This is the GNU system. Welcome.\n")
(define* (etc-directory #:key
- kernel
(locale "C") (timezone "Europe/Paris")
(issue "Hello!\n")
(skeletons '())
@@ -260,9 +259,7 @@ export TZ=\"" timezone "\"
export TZDIR=\"" tzdata "/share/zoneinfo\"
# Tell 'modprobe' & co. where to look for modules.
-# XXX: The downside of doing it here is that when switching to a new config
-# without rebooting, this variable possibly becomes invalid.
-export LINUX_MODULE_DIRECTORY=" kernel "/lib/modules
+export LINUX_MODULE_DIRECTORY=/run/booted-system/kernel/lib/modules
export PATH=$HOME/.guix-profile/bin:/run/current-system/profile/bin
export PATH=/run/setuid-programs:/run/current-system/profile/sbin:$PATH
@@ -326,8 +323,7 @@ alias ll='ls -l'
(append-map service-pam-services services))))
(profile-drv (operating-system-profile os))
(skeletons (operating-system-skeletons os)))
- (etc-directory #:kernel (operating-system-kernel os)
- #:pam-services pam-services
+ (etc-directory #:pam-services pam-services
#:skeletons skeletons
#:issue (operating-system-issue os)
#:locale (operating-system-locale os)