X-Git-Url: http://git.grml.org/?p=grml-terminalserver.git;a=blobdiff_plain;f=default_config;h=f643b453a24d4487fa4441daef8254addf7251bf;hp=33a25acb97a5490f3a5a754e85b80849f45ba6d8;hb=8622b9d4a96f463591d49e885a9fbcc8e0030b92;hpb=cbfb3d9f21fa6c20b1a9cfe2cc769f38cb74228b

diff --git a/default_config b/default_config
index 33a25ac..f643b45 100644
--- a/default_config
+++ b/default_config
@@ -8,36 +8,74 @@ MODULES_PATH_="/lib/modules"
 
 KERNEL_VERSION_=`uname -r`
 
-if [ -e '/live/cow' ]; then
+if [ -e '/live/image' ]; then
   MOUNT_POINT_="/live/image"
 else
   MOUNT_POINT_="/cdrom"
 fi
 
-DATA_PATH_="$MOUNT_POINT_/boot"
+# assume we have a grml2usb system
+if [ -d "$MOUNT_POINT_"/boot/release ] ; then
+  DATA_PATH_="$MOUNT_POINT_/boot/release"
+else # no grml2usb but running from CD
+  DATA_PATH_="$MOUNT_POINT_/boot"
+fi
+
+# new grml2usb layout
+if [ -d "$MOUNT_POINT_"/boot/syslinux ] ; then
+  ISOLIN_PATH_="$MOUNT_POINT_/boot/syslinux"
+  test -d $ISOLIN_PATH_ || ISOLIN_PATH_="$MOUNT_POINT_"
+else # old layout
+  ISOLIN_PATH_="$DATA_PATH_/isolinux"
+  test -d $ISOLIN_PATH_ || ISOLIN_PATH_="$MOUNT_POINT_"
+fi
 
-ISOLIN_PATH_="$DATA_PATH_/isolinux"
-test -d $ISOLIN_PATH_ || ISOLIN_PATH_="$MOUNT_POINT_"
+# addons
+if [[ "$(find $MOUNT_POINT_ -maxdepth 3 -name memtest |head -n1)" != "" ]] ; then
+  ADDONS_PATH_="$(dirname $(find $MOUNT_POINT_ -maxdepth 3 -name memtest |head -n1))"
+fi
 
-ADDONS_PATH_="$(dirname $(find $MOUNT_POINT_ -maxdepth 3 -name memtest |head -n1))"
 if [[ $ADDONS_PATH_ == "" ]]; then
-    ADDONS_PATH_="$MOUNT_POINT_"
+  ADDONS_PATH_="$MOUNT_POINT_"
+fi
+
+if [[ "$(find $DATA_PATH_/ -maxdepth 2 -name vmlinuz |head -n1)" != "" ]] ; then
+  MULTIBOOT_PATH_="$(dirname $(find $DATA_PATH_ -maxdepth 2 -name vmlinuz |head -n1))"
+else
+  MULTIBOOT_PATH_="$MOUNT_POINT_"
 fi
 
-MULTIBOOT_PATH_="$(dirname $(find $DATA_PATH_ -maxdepth 2 -name linux26 |head -n1))"
 if [[ $MULTIBOOT_PATH_ == "" ]]; then
-    MULTIBOOT_PATH_="$MOUNT_POINT_"
+  MULTIBOOT_PATH_="$MOUNT_POINT_"
 fi
 
-KERNEL_IMAGE_="$MULTIBOOT_PATH_/linux26"
+KERNEL_IMAGE_="$MULTIBOOT_PATH_/vmlinuz"
 
-ORIGINAL_INITRD_="$MULTIBOOT_PATH_/initrd.gz"
+if [[ ! -f "$KERNEL_IMAGE_" ]] ; then
+  KERNEL_IMAGE_="/boot/vmlinuz-$KERNEL_VERSION_"
+fi
+
+ORIGINAL_INITRD_="$MULTIBOOT_PATH_/initrd.img"
 
 MEMTEST_IMAGE_="$ADDONS_PATH_/memtest"
+if [ ! -f "$MEMTEST_IMAGE_" ] ; then
+  MEMTEST_IMAGE_=$(find /boot -name memtest*.bin | head -n1)
+fi
 
 PXE_BOOT_MSG_="$ISOLIN_PATH_/boot.msg"
+# grml2usb with grub doesn't provide boot.msg, so generate a default one
+if ! [ -f "$PXE_BOOT_MSG_" ] ; then
+  PXE_BOOT_MSG_="$(mktemp)"
+  cat > $PXE_BOOT_MSG_ << EOF
+17logo.16
+
+Some information and boot options available via keys F2 - F10. http://grml.org/
+
+EOF
+fi
 
 PXE_BOOT_LOGO_="$ISOLIN_PATH_/logo.16"
 
 IPTABLES_SNAT_="true"
 
+# EOF