[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: guix-install.sh: Explicitly set root's home directory.
From: |
Chris Marusich |
Subject: |
01/01: guix-install.sh: Explicitly set root's home directory. |
Date: |
Thu, 29 Mar 2018 01:04:42 -0400 (EDT) |
marusich pushed a commit to branch master
in repository guix.
commit 3cd4447f5639f45b7d833f6fb2adce11ea15ba1d
Author: Chris Marusich <address@hidden>
Date: Sun Mar 25 06:47:42 2018 +0200
guix-install.sh: Explicitly set root's home directory.
* etc/guix-install.sh (ROOT_HOME): New variable.
(sys_create_store, sys_enable_guix_daemon, sys_authorize_build_farms):
Use ROOT_HOME instead of ~root or the HOME environment variable.
* doc/guix.texi (Binary Installation): Instead of assuming that ~ and
$HOME refer to root's directory simply because commands are being run
as root, explicilty refer to it via ~root.
Fixes: <https://bugs.gnu.org/30728>
---
doc/guix.texi | 4 ++--
etc/guix-install.sh | 19 ++++++++++++-------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index d112b37..b6d041d 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -471,7 +471,7 @@ archive content is independent of its creation time, thus
making it
reproducible.
@item
-Make @code{root}'s profile available under @file{~/.guix-profile}:
+Make @code{root}'s profile available under @file{~root/.guix-profile}:
@example
# ln -sf /var/guix/profiles/per-user/root/guix-profile \
@@ -482,7 +482,7 @@ Source @file{etc/profile} to augment @code{PATH} and other
relevant
environment variables:
@example
-# GUIX_PROFILE=$HOME/.guix-profile ; \
+# GUIX_PROFILE="`echo ~root`/.guix-profile" ; \
source $GUIX_PROFILE/etc/profile
@end example
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 933492a..78cd758 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -50,6 +50,11 @@ DEBUG=0
GNU_URL="https://alpha.gnu.org/gnu/guix/"
OPENPGP_SIGNING_KEY_ID="3CE464558A84FDC69DB40CFB090B11993D9AEBB5"
+# This script needs to know where root's home directory is. However, we
+# cannot simply use the HOME environment variable, since there is no guarantee
+# that it points to root's home directory.
+ROOT_HOME="$(echo ~root)"
+
#
------------------------------------------------------------------------------
#+UTILITIES
@@ -264,9 +269,9 @@ sys_create_store()
_msg "${INF}Linking the root user's profile"
ln -sf /var/guix/profiles/per-user/root/guix-profile \
- ~root/.guix-profile
+ "${ROOT_HOME}/.guix-profile"
- GUIX_PROFILE="${HOME}/.guix-profile"
+ GUIX_PROFILE="${ROOT_HOME}/.guix-profile"
source "${GUIX_PROFILE}/etc/profile"
_msg "${PAS}activated root profile at /root/.guix-profile"
}
@@ -316,13 +321,13 @@ sys_enable_guix_daemon()
case "$INIT_SYS" in
upstart)
{ initctl reload-configuration;
- cp ~root/.guix-profile/lib/upstart/system/guix-daemon.conf \
+ cp
"${ROOT_HOME}/.guix-profile/lib/upstart/system/guix-daemon.conf" \
/etc/init/ &&
start guix-daemon; } &&
_msg "${PAS}enabled Guix daemon via upstart"
;;
systemd)
- { cp ~root/.guix-profile/lib/systemd/system/guix-daemon.service \
+ { cp
"${ROOT_HOME}/.guix-profile/lib/systemd/system/guix-daemon.service" \
/etc/systemd/system/;
chmod 664 /etc/systemd/system/guix-daemon.service;
systemctl daemon-reload &&
@@ -332,7 +337,7 @@ sys_enable_guix_daemon()
;;
NA|*)
_msg "${ERR}unsupported init system; run the daemon manually:"
- echo " ~root/.guix-profile/bin/guix-daemon
--build-users-group=guixbuild"
+ echo " ${ROOT_HOME}/.guix-profile/bin/guix-daemon
--build-users-group=guixbuild"
;;
esac
@@ -352,9 +357,9 @@ sys_authorize_build_farms()
while true; do
read -p "Permit downloading pre-built package binaries from the
project's build farms? (yes/no) " yn
case $yn in
- [Yy]*) guix archive --authorize <
~root/.guix-profile/share/guix/hydra.gnu.org.pub &&
+ [Yy]*) guix archive --authorize <
"${ROOT_HOME}/.guix-profile/share/guix/hydra.gnu.org.pub" &&
_msg "${PAS}Authorized public key for hydra.gnu.org";
- guix archive --authorize <
~root/.guix-profile/share/guix/berlin.guixsd.org.pub &&
+ guix archive --authorize <
"${ROOT_HOME}/.guix-profile/share/guix/berlin.guixsd.org.pub" &&
_msg "${PAS}Authorized public key for
berlin.guixsd.org";
break;;
[Nn]*) _msg "${INF}Skipped authorizing build farm public keys"