projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
coccia volumes
[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
dc16002
..
c5a1a20
100755
(executable)
--- a/
modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources
+++ b/
modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources
@@
-12,32
+12,34
@@
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
if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
SRCL="${CHROOT_PATH}/etc/apt/sources.list.d/auto.list"
rm -f "$SRCL"
fi
if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
SRCL="${CHROOT_PATH}/etc/apt/sources.list.d/auto.list"
rm -f "$SRCL"
- mirror=${MIRROR:-
cdn.debian.net
}
+ mirror=${MIRROR:-
http://cdn.debian.net/debian
}
case "${SUITE_BASE:-}" in
experimental)
case "${SUITE_BASE:-}" in
experimental)
- echo "deb
http://$mirror/debian/
sid main" >> "$SRCL"
- echo "deb-src
http://$mirror/debian/
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-src http://security.debian.org/ ${SUITE_BASE}/updates main" >> "$SRCL"
;;
esac
;;
*)
echo "deb http://security.debian.org/ ${SUITE_BASE}/updates main" >> "$SRCL"
echo "deb-src http://security.debian.org/ ${SUITE_BASE}/updates main" >> "$SRCL"
;;
esac
- echo "deb
http://$mirror/debian/
${SUITE_BASE} main" >> "$SRCL"
- echo "deb-src
http://$mirror/debian/
${SUITE_BASE} main" >> "$SRCL"
+ echo "deb
$mirror
${SUITE_BASE} main" >> "$SRCL"
+ echo "deb-src
$mirror
${SUITE_BASE} main" >> "$SRCL"
case "${SUITE_VARIANT:-}" in
backports)
case "${SUITE_VARIANT:-}" in
backports)
@@
-47,17
+49,16
@@
if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
echo "deb-src http://backports.debian.org/debian-backports/ ${SUITE_BASE}-${SUITE_VARIANT} main" >> "$SRCL"
;;
*)
echo "deb-src http://backports.debian.org/debian-backports/ ${SUITE_BASE}-${SUITE_VARIANT} main" >> "$SRCL"
;;
*)
- echo "deb
http://$mirror/debian/
${SUITE_BASE}-${SUITE_VARIANT} main" >> "$SRCL"
- echo "deb-src
http://$mirror/debian/
${SUITE_BASE}-${SUITE_VARIANT} main" >> "$SRCL"
+ echo "deb
$mirror
${SUITE_BASE}-${SUITE_VARIANT} main" >> "$SRCL"
+ echo "deb-src
$mirror
${SUITE_BASE}-${SUITE_VARIANT} main" >> "$SRCL"
;;
esac
;;
esac
;;
esac
;;
esac
- echo "To install build dependencies run"
+ echo "
o
To install build dependencies run"
echo " dd-schroot-cmd -c ${SESSION_ID} apt-get update"
echo " dd-schroot-cmd -c ${SESSION_ID} apt-get update"
- echo "followed by build-dep/install as appropriate in the host system."
- echo
- echo "If you started this session with schroot -b, please do not forget to run"
+ echo " followed by build-dep/install as appropriate in the host system."
+ echo "o If you started this session with schroot -b, please do not forget to run"
echo " schroot --end-session -c ${SESSION_ID}"
echo " schroot --end-session -c ${SESSION_ID}"
- echo "when you no longer need this environment."
+ echo "
when you no longer need this environment."
fi
fi