From 2b9b4292458f766fa66db5fbecbecfea888bb0af Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Wed, 6 Sep 2017 14:13:51 +0200 Subject: [PATCH] Fix relative d-i path for kernel images and initrd in boot-sparc64 --- debian/changelog | 1 + tools/boot/buster/boot-sparc64 | 2 +- tools/boot/stretch/boot-sparc64 | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 695f248a..f59fe5b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ debian-cd (3.1.21) UNRELEASED; urgency=medium * Add support for unreleased packages from Debian Ports. * Remove special handling for palo, silo and yaboot in which_deb. * Fix relative d-i path for kernel images and initrd in boot-hppa. + * Fix relative d-i path for kernel images and initrd in boot-sparc64. -- Steve McIntyre <93sam@debian.org> Mon, 19 Jun 2017 13:59:36 +0100 diff --git a/tools/boot/buster/boot-sparc64 b/tools/boot/buster/boot-sparc64 index 1ba793d3..778aee7f 100755 --- a/tools/boot/buster/boot-sparc64 +++ b/tools/boot/buster/boot-sparc64 @@ -86,7 +86,7 @@ else fi if [ ! -e "$DI_DIR"/initrd.gz ] ; then - DI_DIR="$DI_DIR"/2.6 + DI_DIR="$DI_DIR"/cdrom fi cp "$DI_DIR"/initrd.gz "$inst/boot/initrd.gz" #cp "$DI_DIR"/vmlinuz-*-sparc32 "$inst/boot/sparc32" diff --git a/tools/boot/stretch/boot-sparc64 b/tools/boot/stretch/boot-sparc64 index 794991ce..0adfc928 100755 --- a/tools/boot/stretch/boot-sparc64 +++ b/tools/boot/stretch/boot-sparc64 @@ -86,7 +86,7 @@ else fi if [ ! -e "$DI_DIR"/initrd.gz ] ; then - DI_DIR="$DI_DIR"/2.6 + DI_DIR="$DI_DIR"/cdrom fi cp "$DI_DIR"/initrd.gz "$inst/boot/initrd.gz" #cp "$DI_DIR"/vmlinuz-*-sparc32 "$inst/boot/sparc32"