Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Backport fix from master 

Switch references to d-i.debian.org to use https instead of http.
Closes: #809698
This commit is contained in:
Steve McIntyre 2016-01-03 00:42:12 +00:00
parent e9b8c5dbc4
commit dcce7d822a
27 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -22,6 +22,8 @@ debian-cd (3.1.17-jessie) UNRELEASED; urgency=medium
- Drop the remaining s390 bits from jessie. (s390x remains) - Drop the remaining s390 bits from jessie. (s390x remains)
- Drop the d390oco loader from and jessie - Drop the d390oco loader from and jessie
+ include espeakup on cd1, not speakup, and alsa-utils. Closes: #809497 + include espeakup on cd1, not speakup, and alsa-utils. Closes: #809497
+ Switch references to d-i.debian.org to use https instead of http.
Closes: #809698
-- Steve McIntyre <93sam@debian.org> Mon, 20 Apr 2015 12:36:57 +0100 -- Steve McIntyre <93sam@debian.org> Mon, 20 Apr 2015 12:36:57 +0100

2
tools/boot/jessie/boot-alpha
View File

@ -26,7 +26,7 @@ N=$1
CDDIR=$2 CDDIR=$2
BOOTDIR= BOOTDIR=
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/alpha/daily/cdrom/" DI_WWW_HOME="https://d-i.debian.org/daily-images/alpha/daily/cdrom/"
try_di_image_cache try_di_image_cache
fi fi

4
tools/boot/jessie/boot-arm
View File

@ -21,10 +21,10 @@ if [ "$DI_WWW_HOME" = "default" ];then
# do *not* do that - these defs are parsed out by other scripts that # do *not* do that - these defs are parsed out by other scripts that
# won't cope with that # won't cope with that
if [ "$ARCH" = armel ]; then if [ "$ARCH" = armel ]; then
DI_WWW_HOME="http://d-i.debian.org/daily-images/armel/daily" DI_WWW_HOME="https://d-i.debian.org/daily-images/armel/daily"
CUT=3 CUT=3
elif [ "$ARCH" = armhf ]; then elif [ "$ARCH" = armhf ]; then
DI_WWW_HOME="http://d-i.debian.org/daily-images/armhf/daily" DI_WWW_HOME="https://d-i.debian.org/daily-images/armhf/daily"
CUT=3 CUT=3
else else
echo "$0: unknown arch $ARCH; abort" echo "$0: unknown arch $ARCH; abort"

2
tools/boot/jessie/boot-arm64
View File

@ -18,7 +18,7 @@ CDDIR=$2
BOOTDIR= BOOTDIR=
INSTALLDIR="install.a64" INSTALLDIR="install.a64"
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/arm64/daily" DI_WWW_HOME="https://d-i.debian.org/daily-images/arm64/daily"
try_di_image_cache try_di_image_cache
fi fi

2
tools/boot/jessie/boot-hppa
View File

@ -14,7 +14,7 @@ set -e
N=$1 N=$1
CDROOT=$2 CDROOT=$2
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/hppa/daily/cdrom/2.6" DI_WWW_HOME="https://d-i.debian.org/daily-images/hppa/daily/cdrom/2.6"
try_di_image_cache try_di_image_cache
fi fi

2
tools/boot/jessie/boot-hurd
View File

@ -16,7 +16,7 @@ N=$1
CDDIR=$2 CDDIR=$2
BOOTDIR= BOOTDIR=
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/hurd-i386/daily/" DI_WWW_HOME="https://d-i.debian.org/daily-images/hurd-i386/daily/"
try_di_image_cache try_di_image_cache
fi fi

2
tools/boot/jessie/boot-ia64
View File

@ -13,7 +13,7 @@ N=$1
CDDIR=$2 CDDIR=$2
BOOTDIR= BOOTDIR=
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/ia64/daily" DI_WWW_HOME="https://d-i.debian.org/daily-images/ia64/daily"
try_di_image_cache try_di_image_cache
fi fi

4
tools/boot/jessie/boot-kfreebsd
View File

@ -20,9 +20,9 @@ if [ "$DI_WWW_HOME" = "default" ];then
# do *not* do that - these defs are parsed out by other scripts that # do *not* do that - these defs are parsed out by other scripts that
# won't cope with that # won't cope with that
if [ "$ARCH" = kfreebsd-i386 ]; then if [ "$ARCH" = kfreebsd-i386 ]; then
DI_WWW_HOME="http://d-i.debian.org/daily-images/kfreebsd-i386/daily/" DI_WWW_HOME="https://d-i.debian.org/daily-images/kfreebsd-i386/daily/"
else else
DI_WWW_HOME="http://d-i.debian.org/daily-images/kfreebsd-amd64/daily/" DI_WWW_HOME="https://d-i.debian.org/daily-images/kfreebsd-amd64/daily/"
fi fi
try_di_image_cache try_di_image_cache
fi fi

2
tools/boot/jessie/boot-mips
View File

@ -14,7 +14,7 @@ set -e
N=$1 N=$1
CDROOT=$2 CDROOT=$2
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/mips/daily/" DI_WWW_HOME="https://d-i.debian.org/daily-images/mips/daily/"
try_di_image_cache try_di_image_cache
fi fi

2
tools/boot/jessie/boot-mipsel
View File

@ -16,7 +16,7 @@ set -e
N=$1 N=$1
CDROOT=$2 CDROOT=$2
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/mipsel/daily" DI_WWW_HOME="https://d-i.debian.org/daily-images/mipsel/daily"
try_di_image_cache try_di_image_cache
fi fi

2
tools/boot/jessie/boot-powerpc
View File

@ -15,7 +15,7 @@ N=$1
CDDIR=$2 CDDIR=$2
INSTALLDIR=$CDDIR/install INSTALLDIR=$CDDIR/install
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/powerpc/daily" DI_WWW_HOME="https://d-i.debian.org/daily-images/powerpc/daily"
try_di_image_cache try_di_image_cache
fi fi

2
tools/boot/jessie/boot-ppc64el
View File

@ -25,7 +25,7 @@ N=$1
CDDIR=$2 CDDIR=$2
INSTALLDIR=$CDDIR/install INSTALLDIR=$CDDIR/install
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/ppc64el/daily" DI_WWW_HOME="https://d-i.debian.org/daily-images/ppc64el/daily"
try_di_image_cache try_di_image_cache
fi fi

2
tools/boot/jessie/boot-s390x
View File

@ -36,7 +36,7 @@ if [ "$DI_WWW_HOME" = "default" ];then
# do *not* do that - these defs are parsed out by other scripts that # do *not* do that - these defs are parsed out by other scripts that
# won't cope with that # won't cope with that
if [ "$ARCH" = s390x ]; then if [ "$ARCH" = s390x ]; then
DI_WWW_HOME="http://d-i.debian.org/daily-images/s390x/daily" DI_WWW_HOME="https://d-i.debian.org/daily-images/s390x/daily"
fi fi
try_di_image_cache try_di_image_cache
fi fi

2
tools/boot/jessie/boot-sparc
View File

@ -11,7 +11,7 @@ set -e
N=$1 N=$1
CDDIR=$2 CDDIR=$2
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/sparc/daily/cdrom/" DI_WWW_HOME="https://d-i.debian.org/daily-images/sparc/daily/cdrom/"
try_di_image_cache try_di_image_cache
fi fi

4
tools/boot/jessie/boot-x86
View File

@ -40,9 +40,9 @@ if [ "$DI_WWW_HOME" = "default" ];then
# do *not* do that - these defs are parsed out by other scripts that # do *not* do that - these defs are parsed out by other scripts that
# won't cope with that # won't cope with that
if [ "$ARCH" = i386 ]; then if [ "$ARCH" = i386 ]; then
DI_WWW_HOME="http://d-i.debian.org/daily-images/i386/daily" DI_WWW_HOME="https://d-i.debian.org/daily-images/i386/daily"
else else
DI_WWW_HOME="http://d-i.debian.org/daily-images/amd64/daily" DI_WWW_HOME="https://d-i.debian.org/daily-images/amd64/daily"
fi fi
try_di_image_cache try_di_image_cache
else else

4
tools/boot/wheezy/boot-alpha
View File

@ -26,9 +26,9 @@ N=$1
CDDIR=$2 CDDIR=$2
BOOTDIR= BOOTDIR=
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/alpha/daily/cdrom/" DI_WWW_HOME="https://d-i.debian.org/daily-images/alpha/daily/cdrom/"
if [ -n "$DI_DIR" ];then if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}" DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
DI_WWW_HOME="" DI_WWW_HOME=""
fi fi
fi fi

6
tools/boot/wheezy/boot-arm
View File

@ -17,12 +17,12 @@ N=$1
CDDIR=$2 CDDIR=$2
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
if [ "$ARCH" = armel ]; then if [ "$ARCH" = armel ]; then
DI_WWW_HOME="http://d-i.debian.org/daily-images/armel/daily" DI_WWW_HOME="https://d-i.debian.org/daily-images/armel/daily"
else else
DI_WWW_HOME="http://d-i.debian.org/daily-images/armhf/daily" DI_WWW_HOME="https://d-i.debian.org/daily-images/armhf/daily"
fi fi
if [ -n "$DI_DIR" ];then if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}" DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
DI_WWW_HOME="" DI_WWW_HOME=""
echo "Using images from $DI_DIR" echo "Using images from $DI_DIR"
fi fi

4
tools/boot/wheezy/boot-hppa
View File

@ -14,9 +14,9 @@ set -e
N=$1 N=$1
CDROOT=$2 CDROOT=$2
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/hppa/daily/cdrom/2.6" DI_WWW_HOME="https://d-i.debian.org/daily-images/hppa/daily/cdrom/2.6"
if [ -n "$DI_DIR" ];then if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}" DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
DI_WWW_HOME="" DI_WWW_HOME=""
fi fi
fi fi

4
tools/boot/wheezy/boot-hurd
View File

@ -16,9 +16,9 @@ N=$1
CDDIR=$2 CDDIR=$2
BOOTDIR= BOOTDIR=
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/hurd-i386/daily/" DI_WWW_HOME="https://d-i.debian.org/daily-images/hurd-i386/daily/"
if [ -n "$DI_DIR" ];then if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}" DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
DI_WWW_HOME="" DI_WWW_HOME=""
echo "Using images from $DI_DIR" echo "Using images from $DI_DIR"
fi fi

4
tools/boot/wheezy/boot-ia64
View File

@ -13,9 +13,9 @@ N=$1
CDDIR=$2 CDDIR=$2
BOOTDIR= BOOTDIR=
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/ia64/daily" DI_WWW_HOME="https://d-i.debian.org/daily-images/ia64/daily"
if [ -n "$DI_DIR" ];then if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}" DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
DI_WWW_HOME="" DI_WWW_HOME=""
fi fi
fi fi

6
tools/boot/wheezy/boot-kfreebsd
View File

@ -17,12 +17,12 @@ CDDIR=$2
BOOTDIR= BOOTDIR=
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
if [ "$ARCH" = kfreebsd-i386 ]; then if [ "$ARCH" = kfreebsd-i386 ]; then
DI_WWW_HOME="http://d-i.debian.org/daily-images/kfreebsd-i386/daily/" DI_WWW_HOME="https://d-i.debian.org/daily-images/kfreebsd-i386/daily/"
else else
DI_WWW_HOME="http://d-i.debian.org/daily-images/kfreebsd-amd64/daily/" DI_WWW_HOME="https://d-i.debian.org/daily-images/kfreebsd-amd64/daily/"
fi fi
if [ -n "$DI_DIR" ];then if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}" DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
DI_WWW_HOME="" DI_WWW_HOME=""
echo "Using images from $DI_DIR" echo "Using images from $DI_DIR"
fi fi

4
tools/boot/wheezy/boot-mips
View File

@ -14,9 +14,9 @@ set -e
N=$1 N=$1
CDROOT=$2 CDROOT=$2
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/mips/daily/" DI_WWW_HOME="https://d-i.debian.org/daily-images/mips/daily/"
if [ -n "$DI_DIR" ];then if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}" DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
DI_WWW_HOME="" DI_WWW_HOME=""
fi fi
fi fi

4
tools/boot/wheezy/boot-mipsel
View File

@ -16,9 +16,9 @@ set -e
N=$1 N=$1
CDROOT=$2 CDROOT=$2
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/mipsel/daily" DI_WWW_HOME="https://d-i.debian.org/daily-images/mipsel/daily"
if [ -n "$DI_DIR" ];then if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}" DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
DI_WWW_HOME="" DI_WWW_HOME=""
fi fi
fi fi

4
tools/boot/wheezy/boot-powerpc
View File

@ -15,9 +15,9 @@ N=$1
CDDIR=$2 CDDIR=$2
INSTALLDIR=$CDDIR/install INSTALLDIR=$CDDIR/install
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/powerpc/daily" DI_WWW_HOME="https://d-i.debian.org/daily-images/powerpc/daily"
if [ -n "$DI_DIR" ];then if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}" DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
DI_WWW_HOME="" DI_WWW_HOME=""
fi fi
fi fi

6
tools/boot/wheezy/boot-s390-common
View File

@ -36,12 +36,12 @@ if [ "$DI_WWW_HOME" = "default" ];then
# do *not* do that - these defs are parsed out by other scripts that # do *not* do that - these defs are parsed out by other scripts that
# won't cope with that # won't cope with that
if [ "$ARCH" = s390 ]; then if [ "$ARCH" = s390 ]; then
DI_WWW_HOME="http://d-i.debian.org/daily-images/s390/daily" DI_WWW_HOME="https://d-i.debian.org/daily-images/s390/daily"
else else
DI_WWW_HOME="http://d-i.debian.org/daily-images/s390x/daily" DI_WWW_HOME="https://d-i.debian.org/daily-images/s390x/daily"
fi fi
if [ -n "$DI_DIR" -a -e "$DI_DIR/~${DI_WWW_HOME#*~}" ] ; then if [ -n "$DI_DIR" -a -e "$DI_DIR/~${DI_WWW_HOME#*~}" ] ; then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}" DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
DI_WWW_HOME="" DI_WWW_HOME=""
fi fi
fi fi

4
tools/boot/wheezy/boot-sparc
View File

@ -11,9 +11,9 @@ set -e
N=$1 N=$1
CDDIR=$2 CDDIR=$2
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/sparc/daily/cdrom/" DI_WWW_HOME="https://d-i.debian.org/daily-images/sparc/daily/cdrom/"
if [ -n "$DI_DIR" ];then if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}" DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
DI_WWW_HOME="" DI_WWW_HOME=""
fi fi
fi fi

6
tools/boot/wheezy/boot-x86
View File

@ -21,12 +21,12 @@ if [ "$DI_WWW_HOME" = "default" ];then
# do *not* do that - these defs are parsed out by other scripts that # do *not* do that - these defs are parsed out by other scripts that
# won't cope with that # won't cope with that
if [ "$ARCH" = i386 ]; then if [ "$ARCH" = i386 ]; then
DI_WWW_HOME="http://d-i.debian.org/daily-images/i386/daily" DI_WWW_HOME="https://d-i.debian.org/daily-images/i386/daily"
else else
DI_WWW_HOME="http://d-i.debian.org/daily-images/amd64/daily" DI_WWW_HOME="https://d-i.debian.org/daily-images/amd64/daily"
fi fi
if [ -n "$DI_DIR" ];then if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}" DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
DI_WWW_HOME="" DI_WWW_HOME=""
echo "Using images from $DI_DIR" echo "Using images from $DI_DIR"
fi fi