projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bacula-director needs DNS to launch
[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
..
e727138
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)
@@
-375,6
+393,7
@@
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
savelog -l -c 4 "$target"
tar caf "$tartmp" .
if ! [ -z "$keep" ]; then
savelog -l -c 4 "$target"