Minor fixes.

diff --git a/many_releases/aptmark/raspi b/many_releases/aptmark/raspi
index dc6df919f067bea6e5d2d5cae58e28032dcf947c..24b0d19acd40ed98ed6fa285785098e3b763d853 100644 (file)
--- a/many_releases/aptmark/raspi
+++ b/many_releases/aptmark/raspi
@@ -5,4 +5,7 @@ raspi-firmware
 # to boot into a graphical environment
 greetd
 sway
-
+# for convenience
+sudo
+vim
+ack

diff --git a/many_releases/scripts/_misc.sh b/many_releases/scripts/_misc.sh
index b3b21720a952781f26b47619d50167d3c51714ce..c48602de07343cccd09944a2b22c2e9567041300 100755 (executable)
--- a/many_releases/scripts/_misc.sh
+++ b/many_releases/scripts/_misc.sh
@@ -84,11 +84,11 @@ mark_nonrequireds_auto() {
 upgrade_from_older_release() {
     # Upgrade system to calling context's Debian release.
     # Caution: Don't expect any customized /etc files to surivive this!
-    path_sources_list='/etc/apt/sources.list'
+    path_sources_list='/apt/sources.list'
     apt update
     apt -y -o Dpkg::Options::='--force-confnew' upgrade
     apt -y -o Dpkg::Options::='--force-confnew' full-upgrade
-    cp "../etc/all${path_sources_list}" "${path_sources_list}"
+    cp "../etc/all${path_sources_list}" "/etc${path_sources_list}"
     apt clean
     apt update
     apt -y -o Dpkg::Options::='--force-confnew' upgrade

diff --git a/testing/scripts/setup_raspi.sh b/testing/scripts/setup_raspi.sh
index 2ce0d81bc0b359892d7a1440dfb28c5a8eec2737..e8c7230f0e9bb0a9e63d5d14ba29341d2cfcb883 100755 (executable)
--- a/testing/scripts/setup_raspi.sh
+++ b/testing/scripts/setup_raspi.sh
@@ -19,7 +19,7 @@ rm "${FILENAME_PUBLIC_KEY}"
 
 upgrade_from_older_release
 
-# properly apt system
+# properly configure and apt system
 for root in "${PATH_MANY}" '..'; do
     copy_dirtree "${root}${PATH_REL_ETC}" '/etc' all raspi
 done