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

diff --git a/default_config b/default_config
index a780804..33a25ac 100644
--- a/default_config
+++ b/default_config
@@ -14,17 +14,30 @@ else
   MOUNT_POINT_="/cdrom"
 fi
 
-DATA_PATH_="$MOUNT_POINT_/boot/isolinux"
+DATA_PATH_="$MOUNT_POINT_/boot"
 
-KERNEL_IMAGE_="$DATA_PATH_/linux26"
+ISOLIN_PATH_="$DATA_PATH_/isolinux"
+test -d $ISOLIN_PATH_ || ISOLIN_PATH_="$MOUNT_POINT_"
 
-ORIGINAL_INITRD_="$DATA_PATH_/minirt26.gz"
+ADDONS_PATH_="$(dirname $(find $MOUNT_POINT_ -maxdepth 3 -name memtest |head -n1))"
+if [[ $ADDONS_PATH_ == "" ]]; then
+    ADDONS_PATH_="$MOUNT_POINT_"
+fi
+
+MULTIBOOT_PATH_="$(dirname $(find $DATA_PATH_ -maxdepth 2 -name linux26 |head -n1))"
+if [[ $MULTIBOOT_PATH_ == "" ]]; then
+    MULTIBOOT_PATH_="$MOUNT_POINT_"
+fi
+
+KERNEL_IMAGE_="$MULTIBOOT_PATH_/linux26"
+
+ORIGINAL_INITRD_="$MULTIBOOT_PATH_/initrd.gz"
 
-MEMTEST_IMAGE_="$DATA_PATH_/memtest"
+MEMTEST_IMAGE_="$ADDONS_PATH_/memtest"
 
-PXE_BOOT_MSG_="$DATA_PATH_/boot.msg"
+PXE_BOOT_MSG_="$ISOLIN_PATH_/boot.msg"
 
-PXE_BOOT_LOGO_="$DATA_PATH_/logo.16"
+PXE_BOOT_LOGO_="$ISOLIN_PATH_/logo.16"
 
 IPTABLES_SNAT_="true"