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
d6275b5
..
e727138
100755
(executable)
--- a/
modules/schroot/files/setup-dchroot
+++ b/
modules/schroot/files/setup-dchroot
@@
-89,6
+89,7
@@
genschrootconf() {
local name="${suite}_${arch}-dchroot"
fi
local name="${suite}_${arch}-dchroot"
fi
+ local fullname="$name"
case "$arch" in
kfreebsd-*)
aliases="$name"
case "$arch" in
kfreebsd-*)
aliases="$name"
@@
-101,7
+102,7
@@
genschrootconf() {
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
@@
-294,7
+295,7
@@
if [ -z "${builddir:-}" ]; then
fi
done
fi
fi
done
fi
-[ -d "$basedir" ] ||
mkdir -p "$basedir
"
+[ -d "$basedir" ] ||
die "Error: $basedir does not exist (or is not a directory).
"
[ -d "$builddir" ] || die "Error: $builddir does not exist (or is not a directory)."
target="$basedir/$tuple.tar.gz"
[ -d "$builddir" ] || die "Error: $builddir does not exist (or is not a directory)."
target="$basedir/$tuple.tar.gz"
@@
-392,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"