]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Support building chroots that debootstrap does not know yet
authorPeter Palfrader <peter@palfrader.org>
Thu, 5 Sep 2013 13:25:17 +0000 (15:25 +0200)
committerPeter Palfrader <peter@palfrader.org>
Thu, 5 Sep 2013 13:25:17 +0000 (15:25 +0200)
modules/porterbox/files/setup-dchroot

index 69a18e1499df20a01413afa7def62dcebfdecb6f..61d91b2d4c9dc79b33022e6f70ae8f1f0e8912ff 100755 (executable)
@@ -236,6 +236,14 @@ fi
 rootdir=$(mktemp -d "$builddir/create-$suite-XXXXXX")
 cleanup+=("rm -r $rootdir")
 cleanup+=("umount $rootdir/sys")
+script=/usr/share/debootstrap/scripts/"$suite"
+if ! [ -e "$script" ]; then
+    if [ -z "$ubuntu" ]; then
+        script=/usr/share/debootstrap/scripts/sid
+    else
+        script=/usr/share/debootstrap/scripts/gutsy
+    fi
+fi
 
 set -x
 debootstrap \
@@ -243,7 +251,7 @@ debootstrap \
     --include="apt" \
     --variant=buildd \
     --arch="$arch" \
-    "$suite" "$rootdir" "$mirror"
+    "$suite" "$rootdir" "$mirror" "$script"
 echo "$tuple" > "$rootdir/etc/debian_chroot"
 echo "force-unsafe-io" > "$rootdir/etc/dpkg/dpkg.cfg.d/force-unsafe-io"