From 78ab0746a523cc63eca0fd2fe55ac6c5b1ec5d5e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 3 Mar 2015 02:14:14 -0500 Subject: system: Add /etc/ssl symlink; set needed variables in /etc/profile. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- gnu/build/activation.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/build') 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 +;;; Copyright © 2015 Mark H Weaver ;;; ;;; 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) -- cgit 1.4.1