From ea104fa400acfa017e9d7690dea19edef787421f Mon Sep 17 00:00:00 2001
From: Sven Nierlein <sven@consol.de>
Date: Tue, 23 Jul 2024 20:52:59 +0200
Subject: tests: always remove ipv6 entry from hosts file

---
 .github/prepare_debian.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to '.github/prepare_debian.sh')

diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh
index dcf778bc..3f4674a2 100755
--- a/.github/prepare_debian.sh
+++ b/.github/prepare_debian.sh
@@ -64,13 +64,9 @@ apt-get -y install perl \
 	iproute2
 
 # remove ipv6 interface from hosts
-if [ $(ip addr show | grep "inet6 ::1" | wc -l) -eq "0" ]; then
-    sed '/^::1/d' /etc/hosts > /tmp/hosts
-    cp -f /tmp/hosts /etc/hosts
-fi
-
+sed '/^::1/d' /etc/hosts > /tmp/hosts
+cp -f /tmp/hosts /etc/hosts
 ip addr show
-
 cat /etc/hosts
 
 # apache
-- 
cgit v1.2.3-74-g34f1


From 903773eb9c3cc2079187dc99c7b48662148ff679 Mon Sep 17 00:00:00 2001
From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com>
Date: Fri, 25 Oct 2024 12:02:14 +0200
Subject: Add sanity options to test prepare scripts

---
 .github/mock.sh           | 2 ++
 .github/prepare_debian.sh | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to '.github/prepare_debian.sh')

diff --git a/.github/mock.sh b/.github/mock.sh
index 7fbe6903..8da147ec 100755
--- a/.github/mock.sh
+++ b/.github/mock.sh
@@ -2,6 +2,8 @@
 
 set -x
 
+set -euo pipefail
+
 export DEBIAN_FRONTEND=noninteractive
 
 BASE_PATH="/src"
diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh
index 3f4674a2..c38d241e 100755
--- a/.github/prepare_debian.sh
+++ b/.github/prepare_debian.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -x
-set -e
+set -euo pipefail
 
 export DEBIAN_FRONTEND=noninteractive
 
-- 
cgit v1.2.3-74-g34f1


From 78246e904ddfc9c0a88e9f47797dc38c1693abbb Mon Sep 17 00:00:00 2001
From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com>
Date: Fri, 25 Oct 2024 12:30:19 +0200
Subject: prepare_debian.sh: Fix typo

---
 .github/prepare_debian.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github/prepare_debian.sh')

diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh
index c38d241e..3640e500 100755
--- a/.github/prepare_debian.sh
+++ b/.github/prepare_debian.sh
@@ -127,5 +127,5 @@ sed "/NP_HOST_TLS_CERT/s/.*/'NP_HOST_TLS_CERT' => '$(hostname)',/" -i /src/.gith
 
 # create some test files to lower inodes
 for i in $(seq 10); do
-    touch /media/ramdisk2/test.$1
+    touch /media/ramdisk2/test.$i
 done
-- 
cgit v1.2.3-74-g34f1