From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 6 May 2015 06:08:26 +0000 (+0200)
Subject: Use -kfreebsd suite name on jessie/kfreebsd
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=29bad78bb615ff3023579f5ec80ebe1a9480fb70;p=mirror%2Fdsa-puppet.git

Use -kfreebsd suite name on jessie/kfreebsd
---

diff --git a/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources b/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
index 8c5e919d6..c29eb157a 100755
--- a/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
+++ b/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
@@ -22,6 +22,16 @@ else
     fatal "Cannot find config script"
 fi
 
+suite_alias="$SUITE_BASE"
+case "$SUITE_ARCH" in
+    kfreebsd-*)
+        case "$SUITE_BASE" in
+            jessie)
+                suite_alias="$SUITE_BASE-kfreebsd"
+            ;;
+        esac
+        ;;
+esac
 
 if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
   SRCL="${CHROOT_PATH}/etc/apt/sources.list.d/auto.list"
@@ -36,23 +46,23 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
     sid|stretch)
       ;;
     *)
-      echo "deb     http://security.debian.org/ ${SUITE_BASE}/updates main" >> "$SRCL"
-      echo "deb-src http://security.debian.org/ ${SUITE_BASE}/updates main" >> "$SRCL"
+      echo "deb     http://security.debian.org/ ${suite_alias}/updates main" >> "$SRCL"
+      echo "deb-src http://security.debian.org/ ${suite_alias}/updates main" >> "$SRCL"
       ;;
   esac
-  echo "deb     $mirror ${SUITE_BASE} main" >> "$SRCL"
-  echo "deb-src $mirror ${SUITE_BASE} main" >> "$SRCL"
+  echo "deb     $mirror ${suite_alias} main" >> "$SRCL"
+  echo "deb-src $mirror ${suite_alias} main" >> "$SRCL"
 
   case "${SUITE_VARIANT:-}" in
     backports)
       case "${SUITE_BASE:-}" in
         squeeze)
-          echo "deb     http://backports.debian.org/debian-backports/ ${SUITE_BASE}-${SUITE_VARIANT} main" >> "$SRCL"
-          echo "deb-src http://backports.debian.org/debian-backports/ ${SUITE_BASE}-${SUITE_VARIANT} main" >> "$SRCL"
+          echo "deb     http://backports.debian.org/debian-backports/ ${suite_alias}-${SUITE_VARIANT} main" >> "$SRCL"
+          echo "deb-src http://backports.debian.org/debian-backports/ ${suite_alias}-${SUITE_VARIANT} main" >> "$SRCL"
           ;;
         *)
-          echo "deb     $mirror ${SUITE_BASE}-${SUITE_VARIANT} main" >> "$SRCL"
-          echo "deb-src $mirror ${SUITE_BASE}-${SUITE_VARIANT} main" >> "$SRCL"
+          echo "deb     $mirror ${suite_alias}-${SUITE_VARIANT} main" >> "$SRCL"
+          echo "deb-src $mirror ${suite_alias}-${SUITE_VARIANT} main" >> "$SRCL"
           ;;
       esac
       ;;