From: Michael Prokop Date: Fri, 15 Feb 2008 13:32:31 +0000 (+0100) Subject: Rework directory layout to fix isolinux issue X-Git-Tag: 0.4~4 X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=93c0695a2d628b422b50b3efe232bf48adc2b05b Rework directory layout to fix isolinux issue --- diff --git a/debian/changelog b/debian/changelog index d18d21b..46433e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,17 @@ grml-live (0.4) unstable; urgency=low - rt2400-modules-2.6.23-grml - rt2500-modules-2.6.23-grml - rt73-module-2.6.23-grml - - -- Michael Prokop Wed, 13 Feb 2008 19:23:47 +0100 + * Finally fixed the "isolinux does not boot on old hardware" problem. + The problem was a too big boot/isolinux directory. Thanks a lot + for all the testing to Andrea Mayr and Wernfried Haas! + - use /boot/addons/* for allinone.img, balder10.imz, chain.c32, + menu.c32 and memtest + - place $GRML_NAME in /boot/$GRML_NAME/ - this should easify + support of several grml flavours on one single usb pen for the future + - adjust grub's menu.lst and isolinux.cfg as well as grml-live itself + for new directory layout + + -- Michael Prokop Fri, 15 Feb 2008 14:28:45 +0100 grml-live (0.3) unstable; urgency=low diff --git a/grml-live b/grml-live index 93b3c98..7a9615f 100755 --- a/grml-live +++ b/grml-live @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Wed Feb 13 19:24:12 CET 2008 [mika] +# Latest change: Fri Feb 15 14:28:37 CET 2008 [mika] ################################################################################ # read configuration files, set some misc variables {{{ @@ -441,14 +441,17 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then ewarn "$BUILD_OUTPUT/boot exists already, skipping stage 'boot'" ; eend 0 else # booting stuff: + [ -d "$BUILD_OUTPUT"/boot/addons ] || mkdir -p "$BUILD_OUTPUT"/boot/addons [ -d "$BUILD_OUTPUT"/boot/isolinux ] || mkdir -p "$BUILD_OUTPUT"/boot/isolinux - cp /boot/memtest86+.bin "$BUILD_OUTPUT"/boot/isolinux/memtest + [ -d "$BUILD_OUTPUT"/boot/"${GRML_NAME}" ] || mkdir -p "$BUILD_OUTPUT"/boot/"${GRML_NAME}" + + cp /boot/memtest86+.bin "$BUILD_OUTPUT"/boot/addons/memtest # if we don't have an initrd we a) can't boot and b) there was an error # during build, so check for the file: INITRD="$(ls $CHROOT_OUTPUT/boot/initrd* 2>/dev/null| grep -v '.bak$' | sort -r | head -1)" if [ -n "$INITRD" ] ; then - cp $INITRD "$BUILD_OUTPUT"/boot/isolinux/initrd.gz + cp $INITRD "$BUILD_OUTPUT"/boot/"${GRML_NAME}"/initrd.gz find $CHROOT_OUTPUT/boot/ -name initrd\*.bak -exec rm {} \; else log "No initrd found inside $CHROOT_OUTPUT/boot/ - Exiting" @@ -458,7 +461,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then KERNEL_IMAGE="$(ls $CHROOT_OUTPUT/boot/vmlinuz* 2>/dev/null | sort -r | head -1)" if [ -n "$KERNEL_IMAGE" ] ; then - cp "$KERNEL_IMAGE" "$BUILD_OUTPUT"/boot/isolinux/linux26 + cp "$KERNEL_IMAGE" "$BUILD_OUTPUT"/boot/"${GRML_NAME}"/linux26 else log "No kernel found inside $CHROOT_OUTPUT/boot/ - Exiting" eerror "No kernel found inside $CHROOT_OUTPUT/boot/ - Exiting" ; eend 1 @@ -473,7 +476,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then fi cp ${TEMPLATE_DIRECTORY}/boot/isolinux/* "$BUILD_OUTPUT"/boot/isolinux/ - cp ${TEMPLATE_DIRECTORY}/boot/isolinux/* "$BUILD_OUTPUT"/boot/isolinux/ + cp ${TEMPLATE_DIRECTORY}/boot/addons/* "$BUILD_OUTPUT"/boot/addons/ if ! [ -d "${BUILD_OUTPUT}/boot/grub" ] ; then cp -a ${TEMPLATE_DIRECTORY}/boot/grub "$BUILD_OUTPUT"/boot/ @@ -549,10 +552,10 @@ else # execute squashfs: if mksquashfs --help 2>&1 | grep -q -- -no-progress ; then log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend -no-progress" - mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend -no-progress $SQUASHFS_OPTIONS $SQUASHFS_ZLIB + mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/"${GRML_NAME}".squashfs -noappend -no-progress $SQUASHFS_OPTIONS $SQUASHFS_ZLIB else log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend" - mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend $SQUASHFS_OPTIONS $SQUASHFS_ZLIB + mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/"${GRML_NAME}".squashfs -noappend $SQUASHFS_OPTIONS $SQUASHFS_ZLIB fi log "Finished execution of stage 'squashfs' [$(date)]" einfo "Finished execution of stage 'squashfs'" ; eend 0 diff --git a/templates/boot/isolinux/allinone.img b/templates/boot/addons/allinone.img similarity index 100% rename from templates/boot/isolinux/allinone.img rename to templates/boot/addons/allinone.img diff --git a/templates/boot/isolinux/balder10.imz b/templates/boot/addons/balder10.imz similarity index 100% rename from templates/boot/isolinux/balder10.imz rename to templates/boot/addons/balder10.imz diff --git a/templates/boot/isolinux/chain.c32 b/templates/boot/addons/chain.c32 similarity index 100% rename from templates/boot/isolinux/chain.c32 rename to templates/boot/addons/chain.c32 diff --git a/templates/boot/isolinux/memdisk b/templates/boot/addons/memdisk similarity index 100% rename from templates/boot/isolinux/memdisk rename to templates/boot/addons/memdisk diff --git a/templates/boot/isolinux/menu.c32 b/templates/boot/addons/menu.c32 similarity index 100% rename from templates/boot/isolinux/menu.c32 rename to templates/boot/addons/menu.c32 diff --git a/templates/boot/grub/menu.lst b/templates/boot/grub/menu.lst index 4a58f9b..e38f170 100644 --- a/templates/boot/grub/menu.lst +++ b/templates/boot/grub/menu.lst @@ -13,56 +13,56 @@ background = FFCC33 # define entries: title %GRML_NAME% %VERSION% - Default boot (using 1024x768 framebuffer) -kernel /boot/isolinux/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce -initrd /boot/isolinux/initrd.gz +kernel /boot/grml/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce +initrd /boot/grml/initrd.gz title %GRML_NAME% %VERSION% - without framebuffer -kernel /boot/isolinux/linux26 apm=power-off lang=us vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce -initrd /boot/isolinux/initrd.gz +kernel /boot/grml/linux26 apm=power-off lang=us vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce +initrd /boot/grml/initrd.gz title %GRML_NAME% %VERSION% - with 1280x1024 framebuffer -kernel /boot/isolinux/linux26 apm=power-off lang=us vga=794 quiet initrd=initrd.gz boot=live nomce -initrd /boot/isolinux/initrd.gz +kernel /boot/grml/linux26 apm=power-off lang=us vga=794 quiet initrd=initrd.gz boot=live nomce +initrd /boot/grml/initrd.gz title %GRML_NAME% %VERSION% - with 800x600 framebuffer -kernel /boot/isolinux/linux26 apm=power-off lang=us vga=788 quiet initrd=initrd.gz boot=live nomce -initrd /boot/isolinux/initrd.gz +kernel /boot/grml/linux26 apm=power-off lang=us vga=788 quiet initrd=initrd.gz boot=live nomce +initrd /boot/grml/initrd.gz title %GRML_NAME% %VERSION% - failsafe boot -kernel /boot/isolinux/linux26 vga=normal lang=us boot=live noautoconfig atapicd noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia maxcpus=1 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm -initrd /boot/isolinux/initrd.gz +kernel /boot/grml/linux26 vga=normal lang=us boot=live noautoconfig atapicd noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia maxcpus=1 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm +initrd /boot/grml/initrd.gz title %GRML_NAME% %VERSION% - debug mode -kernel /boot/isolinux/linux26 apm=power-off lang=us vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce -initrd /boot/isolinux/initrd.gz +kernel /boot/grml/linux26 apm=power-off lang=us vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce +initrd /boot/grml/initrd.gz title %GRML_NAME% %VERSION% - copy grml squashfs file to RAM -kernel /boot/isolinux/linux26 toram=grml.squashfs apm=power-off lang=us vga=791 quiet boot=live nomce -initrd /boot/isolinux/initrd.gz +kernel /boot/grml/linux26 toram=grml.squashfs apm=power-off lang=us vga=791 quiet boot=live nomce +initrd /boot/grml/initrd.gz title %GRML_NAME% %VERSION% - copy medium to RAM -kernel /boot/isolinux/linux26 toram apm=power-off lang=us vga=791 quiet boot=live nomce -initrd /boot/isolinux/initrd.gz +kernel /boot/grml/linux26 toram apm=power-off lang=us vga=791 quiet boot=live nomce +initrd /boot/grml/initrd.gz title %GRML_NAME% %VERSION% - grml2hd - install grml to local harddisk [adjust it!] -kernel /boot/isolinux/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce partition=/dev/ice1 mbr=/dev/ice -initrd /boot/isolinux/initrd.gz +kernel /boot/grml/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce partition=/dev/ice1 mbr=/dev/ice +initrd /boot/grml/initrd.gz title %GRML_NAME% %VERSION% - forensic mode -kernel /boot/isolinux/linux26 vga=791 lang=us nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live -initrd /boot/isolinux/initrd.gz +kernel /boot/grml/linux26 vga=791 lang=us nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live +initrd /boot/grml/initrd.gz title %GRML_NAME% %VERSION% - serial console mode -kernel /boot/isolinux/linux26 apm=power-off lang=us vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce console=tty1 console=ttyS0,9600n8 -initrd /boot/isolinux/initrd.gz +kernel /boot/grml/linux26 apm=power-off lang=us vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce console=tty1 console=ttyS0,9600n8 +initrd /boot/grml/initrd.gz title Run memtest86+ -kernel /boot/isolinux/memtest +kernel /boot/addons/memtest title Boot FreeDOS -kernel /boot/isolinux/memdisk -initrd /boot/isolinux/balder10.imz +kernel /boot/addons/memdisk +initrd /boot/addons/balder10.imz # title %GRML_NAME% %VERSION% - old boot method -# kernel /boot/isolinux/linux26 ramdisk_size=100000 init=/etc/init apm=power-off lang=us vga=791 nomce quiet grml_dir="live" grml_name="grml.squashfs" -# initrd /boot/isolinux/minirt26.gz +# kernel /boot/grml/linux26 ramdisk_size=100000 init=/etc/init apm=power-off lang=us vga=791 nomce quiet grml_dir="live" grml_name="grml.squashfs" +# initrd /boot/grml/minirt26.gz diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg index 15c1fe5..c4b1c9e 100644 --- a/templates/boot/isolinux/isolinux.cfg +++ b/templates/boot/isolinux/isolinux.cfg @@ -27,123 +27,123 @@ MENU TITLE grml - Boot Menu LABEL grml MENU LABEL grml - Standard Bootup MENU DEFAULT -KERNEL linux26 +KERNEL /boot/grml/linux26 APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce LABEL grml2ram MENU LABEL grml2ram - Copy Squashfs file to RAM MENU DEFAULT -KERNEL linux26 +KERNEL /boot/grml/linux26 APPEND apm=power-off toram=grml.squashfs lang=us vga=791 quiet initrd=initrd.gz boot=live nomce LABEL splash MENU LABEL grml - Bootsplash -KERNEL linux26 +KERNEL /boot/grml/linux26 APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live splash nomce LABEL grml2hd MENU LABEL grml2hd -KERNEL linux26 +KERNEL /boot/grml/linux26 APPEND apm=power-off lang=us quiet initrd=initrd.gz boot=live nomce LABEL debian2hd MENU LABEL debian2hd -KERNEL linux26 +KERNEL /boot/grml/linux26 APPEND apm=power-off lang=us vga=791 initrd=initrd.gz boot=live BOOT_IMAGE=debian2hd nomce LABEL debug MENU LABEL debug -KERNEL linux26 +KERNEL /boot/grml/linux26 APPEND apm=power-off lang=us vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce LABEL bootchart MENU LABEL bootchart -KERNEL linux26 +KERNEL /boot/grml/linux26 APPEND init=/sbin/bootchartd apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce LABEL vmware MENU LABEL vmware -KERNEL linux26 +KERNEL /boot/grml/linux26 APPEND apm=power-off lang=us nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce LABEL qemu MENU LABEL qemu -KERNEL linux26 +KERNEL /boot/grml/linux26 APPEND apm=power-off lang=us nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce qemu LABEL grmlx MENU LABEL grmlx -KERNEL linux26 +KERNEL /boot/grml/linux26 APPEND apm=power-off lang=us startx=wm-ng vga=791 quiet initrd=initrd.gz boot=live nomce LABEL nofb MENU LABEL grml without framebuffer -KERNEL linux26 +KERNEL /boot/grml/linux26 APPEND apm=power-off lang=us vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce LABEL linux26 MENU LABEL linux26 -KERNEL linux26 +KERNEL /boot/grml/linux26 APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce LABEL memtest MENU LABEL memtest -KERNEL memtest +KERNEL /boot/addons/memtest APPEND BOOT_IMAGE=memtest LABEL fb1280x1024 MENU LABEL fb1280x1024 -KERNEL linux26 +KERNEL /boot/grml/linux26 APPEND apm=power-off lang=us vga=794 quiet initrd=initrd.gz boot=live nomce LABEL fb1024x768 MENU LABEL fb1024x768 -KERNEL linux26 +KERNEL /boot/grml/linux26 APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce LABEL fb800x600 MENU LABEL fb800x600 -KERNEL linux26 +KERNEL /boot/grml/linux26 APPEND apm=power-off lang=us vga=788 quiet initrd=initrd.gz boot=live nomce LABEL failsafe MENU LABEL failsafe -KERNEL linux26 +KERNEL /boot/grml/linux26 APPEND initrd=initrd.gz vga=normal lang=us boot=live noautoconfig atapicd noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia maxcpus=1 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm LABEL forensic MENU LABEL forensic -KERNEL linux26 +KERNEL /boot/grml/linux26 APPEND vga=791 lang=us nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live LABEL grub MENU LABEL grub -KERNEL memdisk -APPEND initrd=allinone.img +KERNEL /boot/addons/memdisk +APPEND initrd=/boot/addons/allinone.img LABEL dos MENU LABEL dos -KERNEL memdisk -APPEND initrd=balder10.imz +KERNEL /boot/addons/memdisk +APPEND initrd=/boot/addons/balder10.imz LABEL serial MENU LABEL serial -KERNEL linux26 +KERNEL /boot/grml/linux26 APPEND apm=power-off lang=us vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce console=tty1 console=ttyS0,9600n8 LABEL userdef MENU LABEL User defined MENU HIDE -KERNEL linux26 +KERNEL /boot/grml/linux26 APPEND ############################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################### LABEL hda MENU LABEL Boot First Harddrive (via chain.c32) -KERNEL chain.c32 +KERNEL /boot/addons/chain.c32 APPEND hd0 0 LABEL fd0 MENU LABEL Boot First Floppy Drive (via chain.c32) -KERNEL chain.c32 +KERNEL /boot/addons/chain.c32 APPEND fd0 LABEL hd