diff --git a/configs/bb.org-debian-stretch-iot-v4.9.conf b/configs/bb.org-debian-stretch-iot-v4.9.conf
index 038bec2b203112a552b90883d6a33cb75ffff378..00bd7da4bc4cf9452a150f774d7fe617bfe5bb74 100644
--- a/configs/bb.org-debian-stretch-iot-v4.9.conf
+++ b/configs/bb.org-debian-stretch-iot-v4.9.conf
@@ -81,7 +81,7 @@ deb_include=" \
deb_exclude=""
#
deb_components="main contrib non-free"
-deb_mirror="deb.debian.org/debian/"
+deb_mirror=""
##
##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
##
diff --git a/configs/bb.org-debian-stretch-wayland-v4.4.conf b/configs/bb.org-debian-stretch-wayland-v4.4.conf
index b9bda3542cbfc0e60a6075eeb3b5c506b054d0ed..baaaaa130f33e26b33b14038ed51bb9f4e63233d 100644
--- a/configs/bb.org-debian-stretch-wayland-v4.4.conf
+++ b/configs/bb.org-debian-stretch-wayland-v4.4.conf
@@ -80,7 +80,7 @@ deb_include=" \
deb_exclude=""
#
deb_components="main contrib non-free"
-deb_mirror="deb.debian.org/debian/"
+deb_mirror=""
##
##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
##
diff --git a/configs/bb.org-debian-wheezy-console.conf b/configs/bb.org-debian-wheezy-console.conf
index 5e114bde994fdfa1aa4a4806b7eb4994daa58940..8308c36b3370b999a258d0783973da3ef35380f5 100644
--- a/configs/bb.org-debian-wheezy-console.conf
+++ b/configs/bb.org-debian-wheezy-console.conf
@@ -43,7 +43,7 @@ deb_exclude=" \
#
deb_components="main contrib non-free"
-deb_mirror=""
+deb_mirror="ftp.us.debian.org/debian"
##
##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
##
diff --git a/configs/bb.org-debian-wheezy-lxde-2gb.conf b/configs/bb.org-debian-wheezy-lxde-2gb.conf
index b7f2f2068e2c7b6e4ba69e5c887c84d12fb85ed4..4501b14e41e7afd48b4c10952aeb2067ec53582b 100644
--- a/configs/bb.org-debian-wheezy-lxde-2gb.conf
+++ b/configs/bb.org-debian-wheezy-lxde-2gb.conf
@@ -30,7 +30,7 @@ deb_include=" \
deb_exclude=""
#
deb_components="main contrib non-free"
-deb_mirror=""
+deb_mirror="ftp.us.debian.org/debian"
##
##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
##
diff --git a/configs/bb.org-debian-wheezy-lxde-4gb.conf b/configs/bb.org-debian-wheezy-lxde-4gb.conf
index b237b31248d35bb06ac341dcb385850c5cea4532..04a93769cc40063fdc58294d4cc28368aa123152 100644
--- a/configs/bb.org-debian-wheezy-lxde-4gb.conf
+++ b/configs/bb.org-debian-wheezy-lxde-4gb.conf
@@ -31,7 +31,7 @@ deb_include=" \
deb_exclude=""
#
deb_components="main contrib non-free"
-deb_mirror=""
+deb_mirror="ftp.us.debian.org/debian"
##
##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
##
diff --git a/configs/eewiki_bare_debian_wheezy_armel.conf b/configs/eewiki_bare_debian_wheezy_armel.conf
index c7f80d30849956288cfc3b084a18fee29c0d01ba..43c69c567a121a94a01cdb82f99cf0b6b97c5548 100644
--- a/configs/eewiki_bare_debian_wheezy_armel.conf
+++ b/configs/eewiki_bare_debian_wheezy_armel.conf
@@ -29,7 +29,7 @@ deb_exclude=" \
"
deb_components="main contrib non-free"
-deb_mirror=""
+deb_mirror="ftp.us.debian.org/debian"
##
##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
##
diff --git a/configs/eewiki_bare_debian_wheezy_armhf.conf b/configs/eewiki_bare_debian_wheezy_armhf.conf
index 55696cee9db262a736e60403b2bb256eead208f4..046a68da43428c6cd80128e1819db4e0466df764 100644
--- a/configs/eewiki_bare_debian_wheezy_armhf.conf
+++ b/configs/eewiki_bare_debian_wheezy_armhf.conf
@@ -29,7 +29,7 @@ deb_exclude=" \
"
deb_components="main contrib non-free"
-deb_mirror=""
+deb_mirror="ftp.us.debian.org/debian"
##
##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
##
diff --git a/configs/eewiki_minfs_debian_stretch_arm64.conf b/configs/eewiki_minfs_debian_stretch_arm64.conf
index d38eaff1338f7ba83923cfcf44e48e3a0768d6b3..99b85e6787e98a0093ede5706d94fd88791d4d9c 100644
--- a/configs/eewiki_minfs_debian_stretch_arm64.conf
+++ b/configs/eewiki_minfs_debian_stretch_arm64.conf
@@ -53,7 +53,7 @@ deb_include=" \
deb_exclude=""
deb_components="main contrib non-free"
-deb_mirror="deb.debian.org/debian/"
+deb_mirror=""
##
##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
##
diff --git a/configs/eewiki_minfs_debian_wheezy_armel.conf b/configs/eewiki_minfs_debian_wheezy_armel.conf
index bcb7f8a41d0d84a41c20da97b64aad81c09fa27e..f9516ab827384e7abfb5d191c56cf836088fb228 100644
--- a/configs/eewiki_minfs_debian_wheezy_armel.conf
+++ b/configs/eewiki_minfs_debian_wheezy_armel.conf
@@ -61,7 +61,7 @@ deb_include=" \
deb_exclude=""
deb_components="main contrib non-free"
-deb_mirror=""
+deb_mirror="ftp.us.debian.org/debian"
##
##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
##
diff --git a/configs/eewiki_minfs_debian_wheezy_armhf.conf b/configs/eewiki_minfs_debian_wheezy_armhf.conf
index d1d5db0922d176e4434c46dad69d97fd13df071f..9ab448c8b19ea1fc8370e10f91cc17ed61e0b7cf 100644
--- a/configs/eewiki_minfs_debian_wheezy_armhf.conf
+++ b/configs/eewiki_minfs_debian_wheezy_armhf.conf
@@ -61,7 +61,7 @@ deb_include=" \
deb_exclude=""
deb_components="main contrib non-free"
-deb_mirror=""
+deb_mirror="ftp.us.debian.org/debian"
##
##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
##
diff --git a/configs/machinekit-debian-wheezy.conf b/configs/machinekit-debian-wheezy.conf
index aa4bddddb7383e105f7db6da7aa20d491658414e..18650fa01376d447520621f1518c8dacbfcc6d8e 100644
--- a/configs/machinekit-debian-wheezy.conf
+++ b/configs/machinekit-debian-wheezy.conf
@@ -31,7 +31,7 @@ deb_include=" \
deb_exclude=""
#
deb_components="main contrib non-free"
-deb_mirror=""
+deb_mirror="ftp.us.debian.org/debian"
##
##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
##
diff --git a/configs/rcn-ee_console_debian_stretch_armhf.conf b/configs/rcn-ee_console_debian_stretch_armhf.conf
index cd04756b9b6d9d8c56b4777f74c0137ae9c7c12c..8913725318aba5bddb8d3bbd47ac3f7b2120a07b 100644
--- a/configs/rcn-ee_console_debian_stretch_armhf.conf
+++ b/configs/rcn-ee_console_debian_stretch_armhf.conf
@@ -71,7 +71,7 @@ deb_include=" \
deb_exclude=""
deb_components="main contrib non-free"
-deb_mirror="deb.debian.org/debian/"
+deb_mirror=""
##
##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
##
diff --git a/configs/rcn-ee_console_debian_wheezy_armhf.conf b/configs/rcn-ee_console_debian_wheezy_armhf.conf
index 680f9423cb437ee0162293b9deb8138e83273e19..18a3ac11c059d2c4aaeb08ac7d82de42cdb89a06 100644
--- a/configs/rcn-ee_console_debian_wheezy_armhf.conf
+++ b/configs/rcn-ee_console_debian_wheezy_armhf.conf
@@ -64,7 +64,7 @@ deb_include=" \
deb_exclude=""
deb_components="main contrib non-free"
-deb_mirror=""
+deb_mirror="ftp.us.debian.org/debian"
##
##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
##
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 5e7bcaee9383d320e0e5e65cfa9d689c4ffbc660..d0bf6d48fb895c0ea1a4ceb93206f87502ce0bfa 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -72,13 +72,11 @@ check_defines () {
case "${deb_distribution}" in
debian)
deb_components=${deb_components:-"main contrib non-free"}
- deb_mirror=${deb_mirror:-"httpredir.debian.org/debian/"}
- #Debian Stretch:
- #deb_mirror=${deb_mirror:-"deb.debian.org/debian/"}
+ deb_mirror=${deb_mirror:-"deb.debian.org/debian"}
;;
ubuntu)
deb_components=${deb_components:-"main universe multiverse"}
- deb_mirror=${deb_mirror:-"ports.ubuntu.com/ubuntu-ports/"}
+ deb_mirror=${deb_mirror:-"ports.ubuntu.com/ubuntu-ports"}
;;
esac
@@ -341,7 +339,7 @@ echo "#deb-src http://${deb_mirror} ${deb_codename} ${deb_components}" >> ${wfil
echo "" >> ${wfile}
case "${deb_codename}" in
-stretch|buster|sid)
+buster|sid)
echo "#deb http://${deb_mirror} ${deb_codename}-updates ${deb_components}" >> ${wfile}
echo "##deb-src http://${deb_mirror} ${deb_codename}-updates ${deb_components}" >> ${wfile}
;;
@@ -352,23 +350,36 @@ stretch|buster|sid)
esac
case "${deb_codename}" in
-wheezy|jessie)
+wheezy)
echo "" >> ${wfile}
echo "deb http://security.debian.org/ ${deb_codename}/updates ${deb_components}" >> ${wfile}
echo "#deb-src http://security.debian.org/ ${deb_codename}/updates ${deb_components}" >> ${wfile}
echo "" >> ${wfile}
if [ "x${chroot_enable_debian_backports}" = "xenable" ] ; then
- echo "deb http://httpredir.debian.org/debian ${deb_codename}-backports ${deb_components}" >> ${wfile}
- echo "#deb-src http://httpredir.debian.org/debian ${deb_codename}-backports ${deb_components}" >> ${wfile}
+ echo "deb http://ftp.us.debian.org/debian ${deb_codename}-backports ${deb_components}" >> ${wfile}
+ echo "#deb-src http://ftp.us.debian.org/debian ${deb_codename}-backports ${deb_components}" >> ${wfile}
else
- echo "#deb http://httpredir.debian.org/debian ${deb_codename}-backports ${deb_components}" >> ${wfile}
- echo "##deb-src http://httpredir.debian.org/debian ${deb_codename}-backports ${deb_components}" >> ${wfile}
+ echo "#deb http://ftp.us.debian.org/debian ${deb_codename}-backports ${deb_components}" >> ${wfile}
+ echo "##deb-src http://ftp.us.debian.org/debian ${deb_codename}-backports ${deb_components}" >> ${wfile}
fi
;;
-stretch)
+jessie|stretch)
echo "" >> ${wfile}
- echo "#deb http://security.debian.org/ ${deb_codename}/updates ${deb_components}" >> ${wfile}
- echo "##deb-src http://security.debian.org/ ${deb_codename}/updates ${deb_components}" >> ${wfile}
+ echo "deb http://deb.debian.org/debian-security ${deb_codename}/updates ${deb_components}" >> ${wfile}
+ echo "#deb-src http://deb.debian.org/debian-security ${deb_codename}/updates ${deb_components}" >> ${wfile}
+ echo "" >> ${wfile}
+ if [ "x${chroot_enable_debian_backports}" = "xenable" ] ; then
+ echo "deb http://deb.debian.org/debian ${deb_codename}-backports ${deb_components}" >> ${wfile}
+ echo "#deb-src http://deb.debian.org/debian ${deb_codename}-backports ${deb_components}" >> ${wfile}
+ else
+ echo "#deb http://deb.debian.org/debian ${deb_codename}-backports ${deb_components}" >> ${wfile}
+ echo "##deb-src http://deb.debian.org/debian ${deb_codename}-backports ${deb_components}" >> ${wfile}
+ fi
+ ;;
+buster|sid)
+ echo "" >> ${wfile}
+ echo "#deb http://deb.debian.org/debian-security ${deb_codename}/updates ${deb_components}" >> ${wfile}
+ echo "##deb-src http://deb.debian.org/debian-security ${deb_codename}/updates ${deb_components}" >> ${wfile}
echo "" >> ${wfile}
;;
esac