projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename new cert files
[mirror/dsa-puppet.git]
/
modules
/
porterbox
/
files
/
schroot-dsa
/
config
diff --git
a/modules/porterbox/files/schroot-dsa/config
b/modules/porterbox/files/schroot-dsa/config
index
172cae4
..
86be1a9
100644
(file)
--- a/
modules/porterbox/files/schroot-dsa/config
+++ b/
modules/porterbox/files/schroot-dsa/config
@@
-5,19
+5,34
@@
## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
##
## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
##
-. "/etc/schroot/default/config"
+if [ -e "$/etc/schroot/default/config" ]; then
+ . "$/etc/schroot/default/config"
+else
+ FSTAB="/etc/schroot/default/fstab"
+ COPYFILES="/etc/schroot/default/copyfiles"
+ NSSDATABASES="/etc/schroot/default/nssdatabases"
+fi
+
# added by weasel:
if [ "$CHROOT_SESSION_PURGE" = "true" ]; then
# added by weasel:
if [ "$CHROOT_SESSION_PURGE" = "true" ]; then
- case $CHROOT_NAME in
- *-*_*-dchroot-*)
- suitevariant_arch_tuple=${CHROOT_NAME%%-dchroot-*}
+ case $CHROOT_DESCRIPTION in
+ "["*-*_*-dchroot"]"*)
+ chroot_type="$CHROOT_DESCRIPTION"; chroot_type="${chroot_type#\[}"; chroot_type="${chroot_type%%]*}"
+ suitevariant_arch_tuple="${chroot_type%%-dchroot-*}"
suitevariant=${suitevariant_arch_tuple%_*}
SUITE_BASE=${suitevariant%-*}
SUITE_VARIANT=${suitevariant##*-}
;;
suitevariant=${suitevariant_arch_tuple%_*}
SUITE_BASE=${suitevariant%-*}
SUITE_VARIANT=${suitevariant##*-}
;;
- *_*-dchroot-*)
- SUITE_BASE=${CHROOT_NAME%%_*}
+ "["*_*-dchroot"]"*)
+ chroot_type="$CHROOT_DESCRIPTION"; chroot_type="${chroot_type#\[}"; chroot_type="${chroot_type%%]*}"
+ SUITE_BASE="${chroot_type%%_*}"
+ ;;
+ *)
+ if [ "$STAGE" = "setup-start" ]; then
+ echo >&2 "Unable to parse chroot description for what kind of chroot you want."
+ exit 1
+ fi
;;
esac
fi
;;
esac
fi