all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#60068] [PATCH 1/2] guix-install.sh: Add GUIX_ALLOW_OVERWRITE environment variable.
@ 2022-12-14 15:56 Maxim Cournoyer
  2022-12-14 15:56 ` [bug#60069] [PATCH 2/2] guix-install.sh: Directly exit in case of errors in chk_require Maxim Cournoyer
                   ` (2 more replies)
  0 siblings, 3 replies; 16+ messages in thread
From: Maxim Cournoyer @ 2022-12-14 15:56 UTC (permalink / raw)
  To: 60068; +Cc: Maxim Cournoyer

The need for this use case appeared when attempting to install Guix on a truly
minimal image made with Buildroot, which lacked enough GNU components that I
had to extract a guix pack to /gnu before attempting installation, which would
then refuse to proceed because of the existing /gnu.

* etc/guix-install.sh: Document environment variables.
(REQUIRE): Add missing "useradd" command.
(sys_create_store) [GUIX_ALLOW_OVERWRITE]: Skip pre-existing installation
checks and output a warning.  Extract the tarball directly to /.
---
 etc/guix-install.sh | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index fb9006b3e2..06730f7e3f 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -29,6 +29,22 @@
 
 # We require Bash but for portability we'd rather not use /bin/bash or
 # /usr/bin/env in the shebang, hence this hack.
+
+# Environment variables
+#
+# GUIX_BINARY_FILE_NAME
+#
+# Can be used to override the automatic download mechanism and point
+# to a local Guix binary archive filename like
+# "/tmp/guix-binary-1.4.0rc2.armhf-linux.tar.xz"
+#
+# GUIX_ALLOW_OVERWRITE
+#
+# Instead of aborting to avoid overwriting a previous installations,
+# allow copying over /var/guix or /gnu.  This can be useful when the
+# installation required the user to extract Guix packs under /gnu to
+# satisfy its dependencies.
+
 if [ "x$BASH_VERSION" = "x" ]
 then
     exec bash "$0" "$@"
@@ -53,6 +69,7 @@ REQUIRE=(
     "chmod"
     "uname"
     "groupadd"
+    "useradd"
     "tail"
     "tr"
     "xz"
@@ -337,16 +354,15 @@ sys_create_store()
 
     _debug "--- [ ${FUNCNAME[0]} ] ---"
 
-    if [[ -e "/var/guix" || -e "/gnu" ]]; then
+    if [[ -z $GUIX_ALLOW_OVERWRITE && (-e /var/guix || -e /gnu) ]]; then
         die "A previous Guix installation was found.  Refusing to overwrite."
+    else
+        _msg "${WAR}Overwriting existing installation!"
     fi
 
     cd "$tmp_path"
-    tar --extract --file "$pkg" && _msg "${PAS}unpacked archive"
-
     _msg "${INF}Installing /var/guix and /gnu..."
-    mv "${tmp_path}/var/guix" /var/
-    mv "${tmp_path}/gnu" /
+    tar --extract --file "$pkg" -C /
 
     _msg "${INF}Linking the root user's profile"
     mkdir -p ~root/.config/guix

base-commit: 1b6e251ed1bae7aa2f544e8ccb6b4aaf872e77e6
-- 
2.38.1





^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2023-02-04  4:38 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-14 15:56 [bug#60068] [PATCH 1/2] guix-install.sh: Add GUIX_ALLOW_OVERWRITE environment variable Maxim Cournoyer
2022-12-14 15:56 ` [bug#60069] [PATCH 2/2] guix-install.sh: Directly exit in case of errors in chk_require Maxim Cournoyer
2022-12-14 16:37   ` Tobias Geerinckx-Rice via Guix-patches via
2022-12-14 18:17     ` Maxim Cournoyer
2022-12-14 18:33       ` Maxim Cournoyer
2022-12-14 16:16 ` [bug#60068] [PATCH 1/2] guix-install.sh: Add GUIX_ALLOW_OVERWRITE environment variable Tobias Geerinckx-Rice via Guix-patches via
2022-12-14 18:25   ` Maxim Cournoyer
2023-02-04  4:36     ` Maxim Cournoyer
2022-12-14 20:46 ` [bug#60068] [PATCH v2 1/3] guix-install.sh: Add missing "useradd" command Maxim Cournoyer
2022-12-14 20:46   ` [bug#60068] [PATCH v2 2/3] guix-install.sh: Add GUIX_ALLOW_OVERWRITE environment variable Maxim Cournoyer
2022-12-15 14:43     ` [bug#60068] bug#60069: [PATCH 2/2] guix-install.sh: Directly exit in case of errors in chk_require Ludovic Courtès
2022-12-16  5:07       ` [bug#60069] " Maxim Cournoyer
2022-12-15 14:44     ` [bug#60068] bug#60069: " Ludovic Courtès
2022-12-14 20:46   ` [bug#60068] [PATCH v2 3/3] " Maxim Cournoyer
2022-12-15 14:41   ` [bug#60068] bug#60069: [PATCH 2/2] " Ludovic Courtès
2022-12-16  5:24     ` Maxim Cournoyer

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.