From: Christian Heller <c.heller@plomlompom.de>
Date: Fri, 25 Oct 2024 03:22:32 +0000 (+0200)
Subject: Various improvements.
X-Git-Url: https://plomlompom.com/repos/te&quot;st.html?a=commitdiff_plain;h=331d5ec4e7f5407440e41bd39bcfe463ead28a3b;p=config

Various improvements.
---

diff --git a/many_releases/aptmark/all b/many_releases/aptmark/all
new file mode 100644
index 0000000..e0dc9ee
--- /dev/null
+++ b/many_releases/aptmark/all
@@ -0,0 +1,13 @@
+# connectivity: ifupdown seems necessary everyhwere, isc-dhcp-client
+# unpredictably so
+ifupdown
+isc-dhcp-client
+# git for the setup directory; cloning works with ca-certificates
+ca-certificates
+git
+# to avoid constant warnings about no locale being found
+locales
+# extremely useful for basic network debugging; missed these more than once in an emergency
+netcat-traditional
+iputils-ping
+
diff --git a/many_releases/aptmark/raspi b/many_releases/aptmark/raspi
new file mode 100644
index 0000000..8a9c55c
--- /dev/null
+++ b/many_releases/aptmark/raspi
@@ -0,0 +1,8 @@
+# so we can still connect
+openssh-server
+# this gotta be good for _something_ …
+raspi-firmware
+# to boot into a graphical environment
+greetd
+weston
+
diff --git a/testing/aptmark/all b/testing/aptmark/all
deleted file mode 100644
index e0dc9ee..0000000
--- a/testing/aptmark/all
+++ /dev/null
@@ -1,13 +0,0 @@
-# connectivity: ifupdown seems necessary everyhwere, isc-dhcp-client
-# unpredictably so
-ifupdown
-isc-dhcp-client
-# git for the setup directory; cloning works with ca-certificates
-ca-certificates
-git
-# to avoid constant warnings about no locale being found
-locales
-# extremely useful for basic network debugging; missed these more than once in an emergency
-netcat-traditional
-iputils-ping
-
diff --git a/testing/aptmark/raspi b/testing/aptmark/raspi
deleted file mode 100644
index eab877a..0000000
--- a/testing/aptmark/raspi
+++ /dev/null
@@ -1,5 +0,0 @@
-# so we can still connect
-openssh-server
-# this gotta be good for _something_ …
-raspi-firmware
-
diff --git a/testing/etc/all/apt/sources.list b/testing/etc/all/apt/sources.list
new file mode 100644
index 0000000..9671eed
--- /dev/null
+++ b/testing/etc/all/apt/sources.list
@@ -0,0 +1,2 @@
+deb http://deb.debian.org/debian testing main contrib non-free non-free-firmware
+deb http://security.debian.org/debian-security testing-security main contrib non-free non-free-firmware
diff --git a/testing/etc/all/etc/apt/sources.list b/testing/etc/all/etc/apt/sources.list
deleted file mode 100644
index 9671eed..0000000
--- a/testing/etc/all/etc/apt/sources.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://deb.debian.org/debian testing main contrib non-free non-free-firmware
-deb http://security.debian.org/debian-security testing-security main contrib non-free non-free-firmware
diff --git a/testing/etc/all/etc/locale.conf b/testing/etc/all/etc/locale.conf
deleted file mode 100644
index dd6eee3..0000000
--- a/testing/etc/all/etc/locale.conf
+++ /dev/null
@@ -1 +0,0 @@
-LANG="en_US.UTF-8"
diff --git a/testing/etc/all/locale.conf b/testing/etc/all/locale.conf
new file mode 100644
index 0000000..dd6eee3
--- /dev/null
+++ b/testing/etc/all/locale.conf
@@ -0,0 +1 @@
+LANG="en_US.UTF-8"
diff --git a/testing/scripts/setup_raspi.sh b/testing/scripts/setup_raspi.sh
index d9469ae..2ce0d81 100755
--- a/testing/scripts/setup_raspi.sh
+++ b/testing/scripts/setup_raspi.sh
@@ -21,7 +21,7 @@ upgrade_from_older_release
 
 # properly apt system
 for root in "${PATH_MANY}" '..'; do
-    copy_dirtree "${root}${PATH_REL_ETC}" "" all raspi
+    copy_dirtree "${root}${PATH_REL_ETC}" '/etc' all raspi
 done
 apt update
 mark_nonrequireds_auto