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))"
+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"