projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to find config harder
[mirror/dsa-puppet.git]
/
modules
/
porterbox
/
files
/
schroot-setup.d
/
99porterbox-extra-sources
diff --git
a/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources
b/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources
index
1625f5a
..
c5a1a20
100755
(executable)
--- a/
modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources
+++ b/
modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources
@@
-12,10
+12,12
@@
set -e
. "$SETUP_DATA_DIR/common-data"
. "$SETUP_DATA_DIR/common-functions"
. "$SETUP_DATA_DIR/common-data"
. "$SETUP_DATA_DIR/common-functions"
-if [ -f "$
CHROOT_SCRIPT_CONFIG
" ]; then
+if [ -f "$
{CHROOT_SCRIPT_CONFIG:-}
" ]; then
. "$CHROOT_SCRIPT_CONFIG"
. "$CHROOT_SCRIPT_CONFIG"
-elif [ "$STATUS" = "ok" ]; then
- fatal "script-config file '$CHROOT_SCRIPT_CONFIG' does not exist"
+elif [ -f "$CHROOT_PROFILE_DIR/config" ]; then
+ . "$CHROOT_PROFILE_DIR/config"
+else
+ fatal "Cannot find config script"
fi
fi
@@
-29,7
+31,7
@@
if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
echo "deb $mirror sid main" >> "$SRCL"
echo "deb-src $mirror sid main" >> "$SRCL"
;;
echo "deb $mirror sid main" >> "$SRCL"
echo "deb-src $mirror sid main" >> "$SRCL"
;;
- sid)
+ sid
|jessie
)
;;
*)
echo "deb http://security.debian.org/ ${SUITE_BASE}/updates main" >> "$SRCL"
;;
*)
echo "deb http://security.debian.org/ ${SUITE_BASE}/updates main" >> "$SRCL"