aboutsummaryrefslogtreecommitdiff
path: root/gnu/services
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-05-17 17:39:30 +0200
committerLudovic Courtès <ludo@gnu.org>2014-05-18 00:04:01 +0200
commitb4140694aca6a717ec130e3788b9d877d1b1e534 (patch)
treed9df7912b4ad36ff32e5ef82028e32271f85059b /gnu/services
parentbf43449acefc343557f84c4c14ac83bceff799ad (diff)
downloadguix-b4140694aca6a717ec130e3788b9d877d1b1e534.tar
guix-b4140694aca6a717ec130e3788b9d877d1b1e534.tar.gz
system: Make /run/current-system at activation time.
* gnu/system.scm (etc-directory): Change default value of #:profile. Change contents of SHELLS. Use /run/current-system/profile/{s,}bin in BASHRC. (operating-system-boot-script)[%modules]: Add (guix build linux-initrd). Add call to 'activate-current-system' in gexp. (operating-system-initrd-file, operating-system-grub.cfg): New procedures. (operating-system-derivation): Don't build grub.cfg here and remove it from the file union. * gnu/system/vm.scm (qemu-image): Remove #:populate. (operating-system-build-gid, operating-system-default-contents): Remove. (system-qemu-image): Remove call to 'operating-system-default-contents'. Use 'operating-system-grub.cfg' to get grub.cfg. Add GRUB.CFG to #:inputs. (system-qemu-image/shared-store): Likewise, but don't add GRUB.CFG to #:inputs. (system-qemu-image/shared-store-script): Pass --system kernel option. * guix/build/activation.scm (%booted-system, %current-system): New variables. (boot-time-system, activate-current-system): New procedures. * guix/build/install.scm (evaluate-populate-directive): Add case for ('directory name uid gid mode). (directives, populate-root-file-system): New procedures. * guix/build/vm.scm (initialize-hard-disk): Replace calls to 'evaluate-populate-directive' by a call to 'populate-root-file-system'. * gnu/services/dmd.scm (dmd-configuration-file): Use /run/current-system/profile/bin. * gnu/services/xorg.scm (slim-service): Likewise.
Diffstat (limited to 'gnu/services')
-rw-r--r--gnu/services/dmd.scm2
-rw-r--r--gnu/services/xorg.scm2
2 files changed, 2 insertions, 2 deletions
diff --git a/gnu/services/dmd.scm b/gnu/services/dmd.scm
index 0d17285890..982c196fe4 100644
--- a/gnu/services/dmd.scm
+++ b/gnu/services/dmd.scm
@@ -64,7 +64,7 @@
services))
;; guix-daemon 0.6 aborts if 'PATH' is undefined, so work around it.
- (setenv "PATH" "/run/current-system/bin")
+ (setenv "PATH" "/run/current-system/profile/bin")
(format #t "starting services...~%")
(for-each start '#$(append-map service-provision services))))
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 1988cfa6a0..7215297f69 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -139,7 +139,7 @@ When AUTO-LOGIN? is true, log in automatically as DEFAULT-USER."
(mlet %store-monad ((startx (or startx (xorg-start-command)))
(xinitrc (xinitrc)))
(text-file* "slim.cfg" "
-default_path /run/current-system/bin
+default_path /run/current-system/profile/bin
default_xserver " startx "
xserver_arguments :0 vt7
xauth_path " xauth "/bin/xauth