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"