From 18724d57b610d2f755b20e169bbcb0937f4ba581 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Thu, 31 Oct 2024 15:29:58 +0100
Subject: [PATCH] Update the `archiso` template

---
 .../cloud-init.target.wants/cloud-init-main.service  |  1 +
 .../cloud-init-network.service                       |  1 +
 archiso/packages.x86_64                              |  1 -
 archiso/scripts/valhalla.patch                       | 12 ++++++------
 4 files changed, 8 insertions(+), 7 deletions(-)
 create mode 120000 archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-main.service
 create mode 120000 archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-network.service

diff --git a/archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-main.service b/archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-main.service
new file mode 120000
index 00000000..875ff731
--- /dev/null
+++ b/archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-main.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/cloud-init-main.service
\ No newline at end of file
diff --git a/archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-network.service b/archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-network.service
new file mode 120000
index 00000000..ae777346
--- /dev/null
+++ b/archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-network.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/cloud-init-network.service
\ No newline at end of file
diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64
index 01cd2a02..b8076346 100644
--- a/archiso/packages.x86_64
+++ b/archiso/packages.x86_64
@@ -34,7 +34,6 @@ fish
 foot-terminfo
 fsarchiver
 git
-gnu-netcat
 gpart
 gpm
 gptfdisk
diff --git a/archiso/scripts/valhalla.patch b/archiso/scripts/valhalla.patch
index 48f00540..00fac4e9 100644
--- a/archiso/scripts/valhalla.patch
+++ b/archiso/scripts/valhalla.patch
@@ -1,5 +1,5 @@
 diff --git a/airootfs/root/.zlogin b/airootfs/root/.zlogin
-index bf6bc8f..0c263a9 100644
+index bf6bc8f..bdbe55c 100644
 --- a/airootfs/root/.zlogin
 +++ b/airootfs/root/.zlogin
 @@ -4,3 +4,18 @@ if grep -Fqa 'accessibility=' /proc/cmdline &> /dev/null; then
@@ -12,7 +12,7 @@ index bf6bc8f..0c263a9 100644
 +    cat /sys/class/backlight/*/max_brightness > /sys/class/backlight/*/brightness
 +fi
 +
-+cd "PortValhalla"
++cd "/root/PortValhalla" || exit
 +
 +git diff -p -R --no-ext-diff --no-color --diff-filter=M \
 +    | grep -E "^(diff|(old|new) mode)" --color=never  \
@@ -22,7 +22,7 @@ index bf6bc8f..0c263a9 100644
 +loadkeys de_CH-latin1
 +./scripts/Arch/OS/setup.fish
 diff --git a/packages.x86_64 b/packages.x86_64
-index 724adbf..01cd2a0 100644
+index 1e9a752..b807634 100644
 --- a/packages.x86_64
 +++ b/packages.x86_64
 @@ -30,8 +30,10 @@ ethtool
@@ -33,10 +33,10 @@ index 724adbf..01cd2a0 100644
  foot-terminfo
  fsarchiver
 +git
- gnu-netcat
  gpart
  gpm
-@@ -45,6 +47,7 @@ irssi
+ gptfdisk
+@@ -44,6 +46,7 @@ irssi
  iw
  iwd
  jfsutils
@@ -44,7 +44,7 @@ index 724adbf..01cd2a0 100644
  kitty-terminfo
  ldns
  less
-@@ -75,6 +78,7 @@ nbd
+@@ -74,6 +77,7 @@ nbd
  ndisc6
  nfs-utils
  nilfs-utils