Strip "images/cdrom" suffix from mirror DI_DIR path in boot-alpha

This commit is contained in:
John Paul Adrian Glaubitz 2017-09-29 14:13:41 +02:00
parent 4c8b55f6fe
commit d2a4f9c9c2
4 changed files with 4 additions and 3 deletions

1
debian/changelog vendored
View File

@ -19,6 +19,7 @@ debian-cd (3.1.21) UNRELEASED; urgency=medium
* Fix relative d-i path for kernel images and initrd in boot-sparc64. * Fix relative d-i path for kernel images and initrd in boot-sparc64.
* Add support for unreleased debian-installer packages from Debian Ports. * Add support for unreleased debian-installer packages from Debian Ports.
* Fix relative d-i path for kernel images and initrd in boot-alpha. * Fix relative d-i path for kernel images and initrd in boot-alpha.
* Strip "images/cdrom" suffix from mirror DI_DIR path in boot-alpha.
-- Steve McIntyre <93sam@debian.org> Mon, 19 Jun 2017 13:59:36 +0100 -- Steve McIntyre <93sam@debian.org> Mon, 19 Jun 2017 13:59:36 +0100

View File

@ -72,7 +72,7 @@ for image in initrd.gz vmlinuz; do
if [ ! -e "$image" ]; then if [ ! -e "$image" ]; then
if [ ! "$DI_WWW_HOME" ];then if [ ! "$DI_WWW_HOME" ];then
if [ ! "$DI_DIR" ];then if [ ! "$DI_DIR" ];then
DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom" DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current"
fi fi
ab_file=`ls "$DI_DIR"/cdrom/$image* | tail -1` ab_file=`ls "$DI_DIR"/cdrom/$image* | tail -1`
cp "$ab_file" . cp "$ab_file" .

View File

@ -65,7 +65,7 @@ for image in initrd.gz vmlinuz; do
if [ ! -e "$image" ]; then if [ ! -e "$image" ]; then
if [ ! "$DI_WWW_HOME" ];then if [ ! "$DI_WWW_HOME" ];then
if [ ! "$DI_DIR" ];then if [ ! "$DI_DIR" ];then
DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom" DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current"
fi fi
ab_file=`ls "$DI_DIR"/cdrom/$image* | tail -1` ab_file=`ls "$DI_DIR"/cdrom/$image* | tail -1`
cp "$ab_file" . cp "$ab_file" .

View File

@ -72,7 +72,7 @@ for image in initrd.gz vmlinuz; do
if [ ! -e "$image" ]; then if [ ! -e "$image" ]; then
if [ ! "$DI_WWW_HOME" ];then if [ ! "$DI_WWW_HOME" ];then
if [ ! "$DI_DIR" ];then if [ ! "$DI_DIR" ];then
DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom" DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current"
fi fi
ab_file=`ls "$DI_DIR"/cdrom/$image* | tail -1` ab_file=`ls "$DI_DIR"/cdrom/$image* | tail -1`
cp "$ab_file" . cp "$ab_file" .