more boot script cleanups

This commit is contained in:
Steve McIntyre 2017-05-03 11:31:46 +01:00
parent b6b7c3801a
commit 3fce3f7d98
4 changed files with 11 additions and 5 deletions

View File

@ -38,7 +38,7 @@ cd $CDDIR/..
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
# Exit if this is not CD#1/DVD#1
if [ $NN != 1 ] ; then exit 0; fi
if [ $N != 1 ] ; then exit 0; fi
# This arch is currently not bootable directly from CD, and there's
# not a lot we can do about that. But add the needed files in the

View File

@ -39,7 +39,7 @@ cd $CDDIR/..
# This script is called with $1 (now $N) as the CD to make bootable.
# Exit if this is not a boot disk
if [ $NN != 1 ] ; then exit 0; fi
if [ $N != 1 ] ; then exit 0; fi
BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz"

View File

@ -15,11 +15,17 @@ set -e
N=$1
CDROOT=$2
# Exit if this is not CD#1/DVD#1
if [ $N != 1 ] ; then exit 0; fi
if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="https://d-i.debian.org/daily-images/mipsel/daily"
DI_WWW_HOME="https://d-i.debian.org/daily-images/mips64el/daily"
try_di_image_cache
fi
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
# This arch is currently not bootable directly from CD, and there's
# not a lot we can do about that. But add the needed files in the
# right place so that users can find them, at least

View File

@ -66,7 +66,7 @@ cd $CDDIR/..
# This script is called with $1 (now $N) as the CD to make bootable.
# Exit if this is not a boot disk
if [ $NN != 1 ] ; then exit 0; fi
if [ $N != 1 ] ; then exit 0; fi
INSTALLDIR_amd64="install.amd"
INSTALLDIR_i386="install.386"
@ -117,7 +117,7 @@ for image in $DISK_IMAGES $EXTRA_DISK_IMAGES; do
done
# Only disk one gets the extra files installed
if [ "$NN" = "1" ]; then
if [ "$N" = "1" ]; then
# populate the install directory as well
for disk in $DISK_IMAGES $EXTRA_DISK_IMAGES; do
if [ -e "$disk" ]; then