projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f8487a3
)
Support building chroots that debootstrap does not know yet
author
Peter Palfrader
<peter@palfrader.org>
Thu, 5 Sep 2013 13:25:17 +0000
(15:25 +0200)
committer
Peter Palfrader
<peter@palfrader.org>
Thu, 5 Sep 2013 13:25:17 +0000
(15:25 +0200)
modules/porterbox/files/setup-dchroot
patch
|
blob
|
history
diff --git
a/modules/porterbox/files/setup-dchroot
b/modules/porterbox/files/setup-dchroot
index
69a18e1
..
61d91b2
100755
(executable)
--- a/
modules/porterbox/files/setup-dchroot
+++ b/
modules/porterbox/files/setup-dchroot
@@
-236,6
+236,14
@@
fi
rootdir=$(mktemp -d "$builddir/create-$suite-XXXXXX")
cleanup+=("rm -r $rootdir")
cleanup+=("umount $rootdir/sys")
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 \
set -x
debootstrap \
@@
-243,7
+251,7
@@
debootstrap \
--include="apt" \
--variant=buildd \
--arch="$arch" \
--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"
echo "$tuple" > "$rootdir/etc/debian_chroot"
echo "force-unsafe-io" > "$rootdir/etc/dpkg/dpkg.cfg.d/force-unsafe-io"