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

diff --git a/default_config b/default_config
index 33a25ac..c6f88fc 100644
--- a/default_config
+++ b/default_config
@@ -14,19 +14,39 @@ 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
 
-ISOLIN_PATH_="$DATA_PATH_/isolinux"
-test -d $ISOLIN_PATH_ || ISOLIN_PATH_="$MOUNT_POINT_"
+# 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
+
+# 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 linux26 |head -n1)" != "" ]] ; then
+  MULTIBOOT_PATH_="$(dirname $(find $DATA_PATH_ -maxdepth 2 -name linux26 |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"
@@ -36,8 +56,19 @@ ORIGINAL_INITRD_="$MULTIBOOT_PATH_/initrd.gz"
 MEMTEST_IMAGE_="$ADDONS_PATH_/memtest"
 
 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