Merge pull request #523 from DavHau/dave

kexec: support other compression than gzip

Author: Enzime

src/nixos-anywhere.sh

@@ -671,6 +671,18 @@ TMPDIR=/root/kexec setsid --wait ${maybeSudo} /root/kexec/kexec/run --kexec-extr
   local localUploadCommand=()
   local remoteUploadCommand=()
 
+  # gnu tar cannot automatically detect the compression when decompressing via stdin
+  tarDecomp=""
+  if [[ ${kexecUrl} =~ \.tar\.gz$ ]]; then
+    tarDecomp="--gzip"
+  elif [[ ${kexecUrl} =~ \.tar\.xz$ ]]; then
+    tarDecomp="--xz"
+  elif [[ ${kexecUrl} =~ \.tar\.zstd$ ]]; then
+    tarDecomp="--zstd"
+  elif [[ ${kexecUrl} =~ \.tar$ ]]; then
+    tarDecomp=""
+  fi
+
   if [[ -f $kexecUrl ]]; then
     localUploadCommand=(cat "$kexecUrl")
   elif [[ $hasWget == "y" ]]; then
@@ -686,14 +698,14 @@ TMPDIR=/root/kexec setsid --wait ${maybeSudo} /root/kexec/kexec/run --kexec-extr
   local remoteCommands
   if [[ ${#localUploadCommand[@]} -eq 0 ]]; then
     # Use remote command for download and execution
-    tarCommand="$(printf '%q ' "${remoteUploadCommand[@]}") | ${maybeSudo} tar -C /root/kexec -xvzf-"
+    tarCommand="$(printf '%q ' "${remoteUploadCommand[@]}") | ${maybeSudo} tar -C /root/kexec -xv ${tarDecomp}"
 
     remoteCommands=${remoteCommandTemplate//'%TAR_COMMAND%'/$tarCommand}
 
     runSsh sh -c "$(printf '%q' "$remoteCommands")"
   else
     # Use local command with pipe to remote
-    tarCommand="${maybeSudo} tar -C /root/kexec -xvzf-"
+    tarCommand="${maybeSudo} tar -C /root/kexec -xv ${tarDecomp}"
     remoteCommands=${remoteCommandTemplate//'%TAR_COMMAND%'/$tarCommand}
 
     "${localUploadCommand[@]}" | runSsh sh -c "$(printf '%q' "$remoteCommands")"

tests/from-nixos-build-on-remote.nix

@@ -38,7 +38,7 @@
           -i /root/.ssh/install_key \
           --debug \
           --build-on-remote \
-          --kexec /etc/nixos-anywhere/kexec-installer \
+          --kexec /etc/nixos-anywhere/kexec-installer.tar.gz \
           --store-paths /etc/nixos-anywhere/disko /etc/nixos-anywhere/system-to-install \
           root@installed >&2
       """)

tests/from-nixos-generate-config.nix

@@ -22,7 +22,7 @@
       nixos-anywhere \
         -i /root/.ssh/install_key \
         --debug \
-        --kexec /etc/nixos-anywhere/kexec-installer \
+        --kexec /etc/nixos-anywhere/kexec-installer.tar.gz \
         --disk-encryption-keys /tmp/disk-1.key /tmp/disk-1.key \
         --disk-encryption-keys /tmp/disk-2.key <(echo another-secret) \
         --phases kexec,disko \
@@ -47,7 +47,7 @@
       nixos-anywhere \
         -i /root/.ssh/install_key \
         --debug \
-        --kexec /etc/nixos-anywhere/kexec-installer \
+        --kexec /etc/nixos-anywhere/kexec-installer.tar.gz \
         --disk-encryption-keys /tmp/disk-1.key /tmp/disk-1.key \
         --disk-encryption-keys /tmp/disk-2.key <(echo another-secret) \
         --phases kexec,disko \

tests/from-nixos-separated-phases.nix

@@ -23,7 +23,7 @@
         nixos-anywhere \
           -i /root/.ssh/install_key \
           --debug \
-          --kexec /etc/nixos-anywhere/kexec-installer \
+          --kexec /etc/nixos-anywhere/kexec-installer.tar.gz \
           --phases kexec \
           --store-paths /etc/nixos-anywhere/disko /etc/nixos-anywhere/system-to-install \
           nixos@installed >&2
@@ -46,7 +46,7 @@
           --debug \
           --phases install \
           --store-paths /etc/nixos-anywhere/disko /etc/nixos-anywhere/system-to-install \
-          root@installed >&2 
+          root@installed >&2
       """)
   '';
 }

tests/from-nixos-with-sudo.nix

@@ -22,7 +22,7 @@
       nixos-anywhere \
         -i /root/.ssh/install_key \
         --debug \
-        --kexec /etc/nixos-anywhere/kexec-installer \
+        --kexec /etc/nixos-anywhere/kexec-installer.tar.gz \
         --phases kexec,disko \
         --disk-encryption-keys /tmp/disk-1.key /tmp/disk-1.key \
         --disk-encryption-keys /tmp/disk-2.key <(echo another-secret) \

tests/from-nixos.nix

@@ -47,7 +47,7 @@
         nixos-anywhere \
           -i /root/.ssh/install_key \
           --debug \
-          --kexec /etc/nixos-anywhere/kexec-installer \
+          --kexec /etc/nixos-anywhere/kexec-installer.tar.gz \
           --extra-files /tmp/extra-files \
           --store-paths /etc/nixos-anywhere/disko /etc/nixos-anywhere/system-to-install \
           --chown /home/user 1000:100 \

tests/modules/installer.nix

@@ -9,6 +9,6 @@
   environment.etc = {
     "nixos-anywhere/disko".source = inputs.system-to-install.config.system.build.diskoScriptNoDeps;
     "nixos-anywhere/system-to-install".source = inputs.system-to-install.config.system.build.toplevel;
-    "nixos-anywhere/kexec-installer".source = inputs.kexec-installer;
+    "nixos-anywhere/kexec-installer.tar.gz".source = inputs.kexec-installer;
   };
 }