projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only add host to bacula dsa client list if we do backups for it
[mirror/dsa-puppet.git]
/
modules
/
schroot
/
files
/
setup-dchroot
diff --git
a/modules/schroot/files/setup-dchroot
b/modules/schroot/files/setup-dchroot
index
d015c03
..
1040212
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 arch="$1"; shift
local target="$1"; shift
local extra="${1:-}"; shift || true
+ local aliases=""
if [ -n "$extra" ]; then
local suite="${suite}-${extra}"
if [ -n "$extra" ]; then
local suite="${suite}-${extra}"
@@
-88,10
+89,20
@@
genschrootconf() {
local name="${suite}_${arch}-dchroot"
fi
local name="${suite}_${arch}-dchroot"
fi
+ local fullname="$name"
+ 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}]
cat << EOF
[${name}]
-description=[${name}] Debian $suite chroot for $arch
+description=[${
full
name}] Debian $suite chroot for $arch
type=file
file=$target
EOF
type=file
file=$target
EOF
@@
-103,7
+114,14
@@
EOF
echo "profile=$personality"
if [ "$THISARCH" = "$arch" ] && [ -z "$buildd" ]; then
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)
fi
case "$arch" in
armel|armhf|i386|mips|mipsel|powerpc|s390|sparc)
@@
-124,7
+142,6
@@
EOF
genschrootconf "$suite" "$arch" "$target" "backports"
if [ -n "$buildd" ] ; then
genschrootconf "$suite" "$arch" "$target" "backports-sloppy"
genschrootconf "$suite" "$arch" "$target" "backports"
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
genschrootconf "$suite" "$arch" "$target" "proposed-updates"
genschrootconf "$suite" "$arch" "$target" "security"
case "$arch" in
@@
-366,6
+383,16
@@
chmod +x "$rootdir/usr/local/sbin/policy-rc.d"
[ -z "$bare" ] && [ -z "$ubuntu" ] && chroot "$rootdir" apt-get install -y --no-install-recommends locales-all
chroot "$rootdir" apt-get install -y --no-install-recommends build-essential
[ -z "$bare" ] && chroot "$rootdir" apt-get install -y --no-install-recommends zsh less vim fakeroot devscripts gdb
[ -z "$bare" ] && [ -z "$ubuntu" ] && chroot "$rootdir" apt-get install -y --no-install-recommends locales-all
chroot "$rootdir" apt-get install -y --no-install-recommends build-essential
[ -z "$bare" ] && chroot "$rootdir" apt-get install -y --no-install-recommends zsh less vim fakeroot devscripts gdb
+if [ -n "$buildd" ] ; then
+ case "$suite" in
+ wheezy|jessie|stretch)
+ chroot "$rootdir" apt-get install -y --no-install-recommends apt-transport-https ca-certificates
+ ;;
+ *)
+ chroot "$rootdir" apt-get install -y --no-install-recommends ca-certificates
+ ;;
+ esac
+fi
rm -f "$rootdir/etc/apt/sources.list" "$rootdir/etc/apt/sources.list.d/*"
chroot "$rootdir" apt-get clean
umount "$rootdir/dev" 2>/dev/null || true
rm -f "$rootdir/etc/apt/sources.list" "$rootdir/etc/apt/sources.list.d/*"
chroot "$rootdir" apt-get clean
umount "$rootdir/dev" 2>/dev/null || true
@@
-375,9
+402,10
@@
tartmp=$(tempfile --directory "$basedir" --suffix=".tar.gz")
cleanup+=("rm -f $tartmp")
(
cd "$rootdir"
cleanup+=("rm -f $tartmp")
(
cd "$rootdir"
+ chmod 0755 "$rootdir"
tar caf "$tartmp" .
if ! [ -z "$keep" ]; then
tar caf "$tartmp" .
if ! [ -z "$keep" ]; then
- savelog -l -c
4
"$target"
+ savelog -l -c
2
"$target"
fi
mv "$tartmp" "$target"
)
fi
mv "$tartmp" "$target"
)