While building images recently I noticed a couple of things which were breaking for me in debian-cd.
First the powerpc "prep" variant seems to have been disabled in d-i for ages (since r50159 in Nov 2007) and isn't part of http://d-i.debian.org/daily-images/powerpc/daily/ so don't try and fetch it. Secondly a recent change by Frans to boot-x86 left us with: if [ blah ] ; then # nothing but # comments fi which caused a syntax error. I usually just drop a ":" in there but perhaps just removing the whole if block makes sense if we never expect either of those comment out thing to return. Ian. diff --git a/tools/boot/squeeze/boot-powerpc b/tools/boot/squeeze/boot-powerpc index 213028a..25c74b6 100755 --- a/tools/boot/squeeze/boot-powerpc +++ b/tools/boot/squeeze/boot-powerpc @@ -83,7 +83,7 @@ if [ -n "$KERNEL_PARAMS" ]; then fi cp $BASEDIR/data/$DI_CODENAME/yaboot/ofboot.b ofboot.b -for subarch in powerpc powerpc64 prep +for subarch in powerpc powerpc64 #prep do case $subarch in powerpc|prep) diff --git a/tools/boot/squeeze/boot-x86 b/tools/boot/squeeze/boot-x86 index 58d1276..bbc29b3 100644 --- a/tools/boot/squeeze/boot-x86 +++ b/tools/boot/squeeze/boot-x86 @@ -71,6 +71,7 @@ fi BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz" # Only include disk images on full CDs, not on smaller images. if [ "$ARCH" = i386 ] && [ "$INSTALLER_CD" != 1 ] && [ "$INSTALLER_CD" != 2 ]; then + : #DISK_IMAGES="floppy/cd-drivers.img floppy/boot.img floppy/root.img" #EXTRA_DISK_IMAGES="cdrom/boot.img" fi -- Ian Campbell Brandy-and-water spoils two good things. -- Charles Lamb
signature.asc
Description: This is a digitally signed message part
