~ruther/guix-local

62f0a4792b89a0a734a06ad5667ae109ef4b4d83 — Ludovic Courtès 11 years ago 0918e64
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.
1 files changed, 2 insertions(+), 6 deletions(-)

M gnu/system.scm
M gnu/system.scm => gnu/system.scm +2 -6
@@ 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)