Fix stomping of certfile

[dsa-puppet.git] / modules / schroot / files / setup-dchroot

diff --git a/modules/schroot/files/setup-dchroot b/modules/schroot/files/setup-dchroot
index cfc47bfd06143fea21fb1542ffe2ae6e20e0eaff..c1350cdbf9bfc7ffcaeb665aea9b3efaa4ac5ff2 100755 (executable)
--- a/modules/schroot/files/setup-dchroot
+++ b/modules/schroot/files/setup-dchroot
@@ -77,6 +77,7 @@ genschrootconf() {
     local arch="$1"; shift
     local target="$1"; shift
     local extra="${1:-}"; shift || true
+    local aliases=""
 
     if [ -n "$extra" ]; then
         local suite="${suite}-${extra}"
@@ -88,6 +89,15 @@ genschrootconf() {
         local name="${suite}_${arch}-dchroot"
     fi
 
+    case "$arch" in
+        kfreebsd-*)
+            aliases="$name"
+            # FreeBSD only allows relatively short paths to mountpoints
+            # therefore saving a few charakters making the chroot dir fit
+            name=${name/kfreebsd-amd64/k-a}
+            name=${name/kfreebsd-i386/k-i}
+        ;;
+    esac
 
 cat << EOF
 [${name}]
@@ -103,7 +113,14 @@ EOF
     echo "profile=$personality"
 
     if [ "$THISARCH" = "$arch" ] && [ -z "$buildd" ]; then
-        echo "aliases=$suite"
+        if [ -z "$aliases" ] ; then
+            aliases="$suite"
+        else
+            aliases="$aliases,$suite"
+        fi
+    fi
+    if [ -n "$aliases" ] ; then
+        echo "aliases=$aliases"
     fi
     case "$arch" in
         armel|armhf|i386|mips|mipsel|powerpc|s390|sparc)
@@ -122,12 +139,18 @@ EOF
         *)
             if [ -z "$extra" ] && [ -z "$ubuntu" ]; then
                 genschrootconf "$suite" "$arch" "$target" "backports"
-                [ -n "$buildd" ] && genschrootconf "$suite" "$arch" "$target" "backports-sloppy"
-                [ -n "$buildd" ] && genschrootconf "$suite" "$arch" "$target" "kfreebsd"
-                [ -n "$buildd" ] && genschrootconf "$suite" "$arch" "$target" "lts"
-                [ -n "$buildd" ] && genschrootconf "$suite" "$arch" "$target" "proposed-updates"
-                [ -n "$buildd" ] && genschrootconf "$suite" "$arch" "$target" "security"
-                [ -n "$buildd" ] && genschrootconf "$suite" "$arch" "$target" "kfreebsd-security"
+                if [ -n "$buildd" ] ; then
+                    genschrootconf "$suite" "$arch" "$target" "backports-sloppy"
+                    genschrootconf "$suite" "$arch" "$target" "lts"
+                    genschrootconf "$suite" "$arch" "$target" "proposed-updates"
+                    genschrootconf "$suite" "$arch" "$target" "security"
+                    case "$arch" in
+                        kfreebsd-*)
+                            genschrootconf "$suite" "$arch" "$target" "kfreebsd"
+                            genschrootconf "$suite" "$arch" "$target" "kfreebsd-security"
+                            ;;
+                    esac
+                fi
             fi
     esac
     return 0