diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-03-03 02:14:14 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-03-03 13:49:12 -0500 |
| commit | 78ab0746a523cc63eca0fd2fe55ac6c5b1ec5d5e (patch) | |
| tree | ea331dac650bba92fcbb49db675a844324d13e1e /gnu/build | |
| parent | 536c3ee4e3741926c3791e04e025f5cab6aacf2b (diff) | |
| download | guix-78ab0746a523cc63eca0fd2fe55ac6c5b1ec5d5e.tar.gz | |
system: Add /etc/ssl symlink; set needed variables in /etc/profile.
* gnu/build/activation.scm (activate-etc): Create /etc/ssl symlink. * gnu/system.scm (etc-directory): Set SSL_CERT_DIR, SSL_CERT_FILE, and GIT_SSL_CAINFO in /etc/profile. Co-Authored-By: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/build')
| -rw-r--r-- | gnu/build/activation.scm | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm index dfadde326c..909e971833 100644 --- a/gnu/build/activation.scm +++ b/gnu/build/activation.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -200,6 +201,15 @@ numeric gid or #f." (format #t "populating /etc from ~a...~%" etc) + ;; Create the /etc/ssl -> /run/current-system/profile/etc/ssl symlink. This + ;; symlink, to a target outside of the store, probably doesn't belong in the + ;; static 'etc' store directory. However, if it were to be put there, + ;; beware that if /run/current-system/profile/etc/ssl doesn't exist at the + ;; time of activation (e.g. when installing a fresh system), the call to + ;; 'file-is-directory?' below will fail because it uses 'stat', not 'lstat'. + (rm-f "/etc/ssl") + (symlink "/run/current-system/profile/etc/ssl" "/etc/ssl") + (rm-f "/etc/static") (symlink etc "/etc/static") (for-each (lambda (file) |