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

diff --git a/default_config b/default_config
index f61eac6..33a25ac 100644
--- a/default_config
+++ b/default_config
@@ -17,12 +17,21 @@ fi
 DATA_PATH_="$MOUNT_POINT_/boot"
 
 ISOLIN_PATH_="$DATA_PATH_/isolinux"
+test -d $ISOLIN_PATH_ || ISOLIN_PATH_="$MOUNT_POINT_"
 
-ADDONS_PATH_="$DATA_PATH_/addons"
+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_="$DATA_PATH_/grml/linux26"
+KERNEL_IMAGE_="$MULTIBOOT_PATH_/linux26"
 
-ORIGINAL_INITRD_="$DATA_PATH_/grml/initrd.gz"
+ORIGINAL_INITRD_="$MULTIBOOT_PATH_/initrd.gz"
 
 MEMTEST_IMAGE_="$ADDONS_PATH_/memtest"