From 604432183b7b99c90a41e316ba84ca98a9dc1bb7 Mon Sep 17 00:00:00 2001 From: Steve McIntyre Date: Mon, 28 Mar 2016 23:37:01 +0100 Subject: [PATCH] Minor updates to hurd boot. Closes: #818176 Patch from Samuel Thibault --- debian/changelog | 1 + tools/boot/stretch/boot-hurd | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b8dd6a9a..6f450c06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,6 +48,7 @@ debian-cd (3.1.18) UNRELEASED; urgency=medium [ Samuel Thibault ] * include espeakup on cd1, not speakup, and alsa-utils. Closes: #809497 + * Minor tweaks to hurd boot setup. Closes: #818176 [ Ben Hutchings ] * Add 686 kernels to replace 586 for i386 CDs. Closes: #808958 diff --git a/tools/boot/stretch/boot-hurd b/tools/boot/stretch/boot-hurd index fa44237a..644bca67 100644 --- a/tools/boot/stretch/boot-hurd +++ b/tools/boot/stretch/boot-hurd @@ -39,7 +39,7 @@ if [ $N != 1 ]; then fi # Download boot images. -BOOT_IMAGES="cdrom/debian-cd_info.tar.gz cdrom/gnumach.gz cdrom/initrd.gz cdrom/gtk/initrd.gz cdrom/ext2fs.static cdrom/ld.so.1" +BOOT_IMAGES="cdrom/debian-cd_info.tar.gz cdrom/gnumach.gz cdrom/initrd.gz cdrom/gtk/initrd.gz cdrom/ext2fs.static cdrom/exec.static" for image in $BOOT_IMAGES; do if [ ! -e "$image" ]; then @@ -63,7 +63,7 @@ cp "cdrom/gnumach.gz" "$CDDIR/boot/kernel/gnumach.gz" cp "cdrom/initrd.gz" "$CDDIR/boot/initrd.gz" cp "cdrom/gtk/initrd.gz" "$CDDIR/boot/gtk/initrd.gz" cp "cdrom/ext2fs.static" "$CDDIR/boot/kernel/ext2fs.static" -cp "cdrom/ld.so.1" "$CDDIR/boot/kernel/ld.so.1" +cp "cdrom/exec.static" "$CDDIR/boot/kernel/exec.static" # Install bootloader mkdir -p boot$N