From ac60e5478125ffa88a0491c39a573cd63c8b2496 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Mon, 22 May 2023 08:55:06 +0200
Subject: [PATCH] update to new repository layout, bye bye community repository

---
 usr/lib/archboot/installer/autoconfiguration.sh | 6 +++---
 usr/lib/archboot/installer/pacman.sh            | 8 ++++----
 usr/lib/archboot/run/container.sh               | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/usr/lib/archboot/installer/autoconfiguration.sh b/usr/lib/archboot/installer/autoconfiguration.sh
index fa8aeccd9..8bf8539af 100644
--- a/usr/lib/archboot/installer/autoconfiguration.sh
+++ b/usr/lib/archboot/installer/autoconfiguration.sh
@@ -93,9 +93,9 @@ _auto_testing()
 {
     if [[ -n "${_DOTESTING}" ]]; then
         _dialog --infobox "Enable [testing] repository on installed system..." 3 70
-        sed -i -e '/^#\[testing\]/ { n ; s/^#// }' "${_DESTDIR}"/etc/pacman.conf
-        sed -i -e '/^#\[community-testing\]/ { n ; s/^#// }' "${_DESTDIR}"/etc/pacman.conf
-        sed -i -e 's:^#\[testing\]:\[testing\]:g' -e  's:^#\[community-testing\]:\[community-testing\]:g' "${_DESTDIR}"/etc/pacman.conf
+        sed -i -e '/^#\[core-testing\]/ { n ; s/^#// }' "${_DESTDIR}"/etc/pacman.conf
+        sed -i -e '/^#\[extra-testing\]/ { n ; s/^#// }' "${_DESTDIR}"/etc/pacman.conf
+        sed -i -e 's:^#\[core-testing\]:\[core-testing\]:g' -e  's:^#\[extra-testing\]:\[extra-testing\]:g' "${_DESTDIR}"/etc/pacman.conf
         sleep 2
     fi
 }
diff --git a/usr/lib/archboot/installer/pacman.sh b/usr/lib/archboot/installer/pacman.sh
index c411db0f6..837dd5228 100644
--- a/usr/lib/archboot/installer/pacman.sh
+++ b/usr/lib/archboot/installer/pacman.sh
@@ -52,11 +52,11 @@ _select_mirror() {
 _enable_testing() {
     if ! grep -q "^\[testing\]" /etc/pacman.conf; then
         _DOTESTING=""
-        _dialog --defaultno --yesno "Do you want to enable [testing]\nand [community-testing] repositories?\n\nOnly enable this if you need latest\navailable packages for testing purposes!" 9 50 && _DOTESTING=1
+        _dialog --defaultno --yesno "Do you want to enable [core-testing]\nand [extra-testing] repositories?\n\nOnly enable this if you need latest\navailable packages for testing purposes!" 9 50 && _DOTESTING=1
         if [[ -n "${_DOTESTING}" ]]; then
-            sed -i -e '/^#\[testing\]/ { n ; s/^#// }' /etc/pacman.conf
-            sed -i -e '/^#\[community-testing\]/ { n ; s/^#// }' /etc/pacman.conf
-            sed -i -e 's:^#\[testing\]:\[testing\]:g' -e  's:^#\[community-testing\]:\[community-testing\]:g' /etc/pacman.conf
+            sed -i -e '/^#\[core-testing\]/ { n ; s/^#// }' /etc/pacman.conf
+            sed -i -e '/^#\[extra-testing\]/ { n ; s/^#// }' /etc/pacman.conf
+            sed -i -e 's:^#\[core-testing\]:\[core-testing\]:g' -e  's:^#\[extra-testing\]:\[extra-testing\]:g' /etc/pacman.conf
         fi
     fi
 }
diff --git a/usr/lib/archboot/run/container.sh b/usr/lib/archboot/run/container.sh
index fbcde588c..79490706f 100755
--- a/usr/lib/archboot/run/container.sh
+++ b/usr/lib/archboot/run/container.sh
@@ -26,11 +26,11 @@ if echo "${_BASENAME}" | grep -qw "${_RUNNING_ARCH}"; then
     if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
         _copy_archboot_defaults "${1}"
         # enable [testing] if enabled in host
-        if grep -q "^\[testing" /etc/pacman.conf; then
+        if grep -q "^\[core-testing" /etc/pacman.conf; then
             echo "Enable [testing] repository in container..."
-            sed -i -e '/^#\[testing\]/ { n ; s/^#// }' "${1}/etc/pacman.conf"
-            sed -i -e '/^#\[community-testing\]/ { n ; s/^#// }' "${1}/etc/pacman.conf"
-            sed -i -e 's:^#\[testing\]:\[testing\]:g' -e  's:^#\[community-testing\]:\[community-testing\]:g' "${1}/etc/pacman.conf"
+            sed -i -e '/^#\[core-testing\]/ { n ; s/^#// }' "${1}/etc/pacman.conf"
+            sed -i -e '/^#\[extra-testing\]/ { n ; s/^#// }' "${1}/etc/pacman.conf"
+            sed -i -e 's:^#\[core-testing\]:\[core-testing\]:g' -e  's:^#\[extra-testing\]:\[extra-testing\]:g' "${1}/etc/pacman.conf"
         fi
     fi
 else