Forum | Documentation | Website | Blog

Skip to content
Snippets Groups Projects
Commit dc93af83 authored by Robert Nelson's avatar Robert Nelson
Browse files

debian: httpredir.debian.org/debian/ -> deb.debian.org/debian, so lets leave...

debian: httpredir.debian.org/debian/ -> deb.debian.org/debian, so lets leave wheezy on ftp.us.debian.org/debian and jessie+ now on deb.debian.org/debian

Signed-off-by: default avatarRobert Nelson <robertcnelson@gmail.com>
parent 56f6df9d
Branches
Tags
No related merge requests found
Showing
with 37 additions and 26 deletions
......@@ -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>"
##
......
......@@ -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>"
##
......
......@@ -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>"
##
......
......@@ -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>"
##
......
......@@ -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>"
##
......
......@@ -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>"
##
......
......@@ -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>"
##
......
......@@ -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>"
##
......
......@@ -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>"
##
......
......@@ -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>"
##
......
......@@ -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>"
##
......
......@@ -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>"
##
......
......@@ -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>"
##
......
......@@ -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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment