From 46bce1eb1622bdd167a65c70b2ca276da3a36734 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Fri, 23 Aug 2024 14:19:56 +0200
Subject: [PATCH] Update `archiso`

---
 archiso/airootfs/root/.automated_script.sh |  2 +-
 archiso/scripts/valhalla.patch             | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/archiso/airootfs/root/.automated_script.sh b/archiso/airootfs/root/.automated_script.sh
index 0d950123..f7f3ced2 100755
--- a/archiso/airootfs/root/.automated_script.sh
+++ b/archiso/airootfs/root/.automated_script.sh
@@ -23,7 +23,7 @@ automated_script() {
                 sleep 1
             done
             printf '%s: downloading %s\n' "$0" "${script}"
-            curl "${script}" --location --retry-connrefused --retry 10 -s -o /tmp/startup_script
+            curl "${script}" --location --retry-connrefused --retry 10 --fail -s -o /tmp/startup_script
             rt=$?
         else
             cp "${script}" /tmp/startup_script
diff --git a/archiso/scripts/valhalla.patch b/archiso/scripts/valhalla.patch
index 37730786..5b35adc7 100644
--- a/archiso/scripts/valhalla.patch
+++ b/archiso/scripts/valhalla.patch
@@ -1,8 +1,8 @@
 diff --git a/airootfs/root/.zlogin b/airootfs/root/.zlogin
-index bf6bc8f..76e5893 100755
+index bf6bc8f..a0dae7b 100755
 --- a/airootfs/root/.zlogin
 +++ b/airootfs/root/.zlogin
-@@ -4,3 +4,18 @@ if grep -Fqa 'accessibility=' /proc/cmdline &> /dev/null; then
+@@ -4,3 +4,19 @@ if grep -Fqa 'accessibility=' /proc/cmdline &> /dev/null; then
  fi
  
  ~/.automated_script.sh
@@ -16,13 +16,14 @@ index bf6bc8f..76e5893 100755
 +
 +git diff -p -R --no-ext-diff --no-color --diff-filter=M \
 +    | grep -E "^(diff|(old|new) mode)" --color=never  \
++    | sed "/^diff/{ x; d; }; x; /./{ p; z; }; x;" \
 +    | git apply
 +
 +popd > /dev/null
 +
 +loadkeys de_CH-latin1
 diff --git a/packages.x86_64 b/packages.x86_64
-index 9e876e7..b89ab30 100755
+index 9e876e7..c5db92a 100755
 --- a/packages.x86_64
 +++ b/packages.x86_64
 @@ -30,8 +30,10 @@ ethtool
@@ -36,7 +37,15 @@ index 9e876e7..b89ab30 100755
  gnu-netcat
  gpart
  gpm
-@@ -75,6 +77,7 @@ nbd
+@@ -45,6 +47,7 @@ irssi
+ iw
+ iwd
+ jfsutils
++jq
+ kitty-terminfo
+ ldns
+ less
+@@ -75,6 +78,7 @@ nbd
  ndisc6
  nfs-utils
  nilfs-utils