X-Git-Url: http://git.grml.org/?p=grml-terminalserver.git;a=blobdiff_plain;f=default_config;h=f643b453a24d4487fa4441daef8254addf7251bf;hp=cc1ef4b45e06df43751f09a8e43e8dd8c17e4d68;hb=8622b9d4a96f463591d49e885a9fbcc8e0030b92;hpb=fdea9e5736375443ad3818136cab0bc41f9d9414 diff --git a/default_config b/default_config index cc1ef4b..f643b45 100644 --- a/default_config +++ b/default_config @@ -8,7 +8,7 @@ MODULES_PATH_="/lib/modules" KERNEL_VERSION_=`uname -r` -if [ -e '/live/cow' ]; then +if [ -e '/live/image' ]; then MOUNT_POINT_="/live/image" else MOUNT_POINT_="/cdrom" @@ -39,8 +39,8 @@ if [[ $ADDONS_PATH_ == "" ]]; then 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))" +if [[ "$(find $DATA_PATH_/ -maxdepth 2 -name vmlinuz |head -n1)" != "" ]] ; then + MULTIBOOT_PATH_="$(dirname $(find $DATA_PATH_ -maxdepth 2 -name vmlinuz |head -n1))" else MULTIBOOT_PATH_="$MOUNT_POINT_" fi @@ -49,13 +49,13 @@ if [[ $MULTIBOOT_PATH_ == "" ]]; then MULTIBOOT_PATH_="$MOUNT_POINT_" fi -KERNEL_IMAGE_="$MULTIBOOT_PATH_/linux26" +KERNEL_IMAGE_="$MULTIBOOT_PATH_/vmlinuz" if [[ ! -f "$KERNEL_IMAGE_" ]] ; then KERNEL_IMAGE_="/boot/vmlinuz-$KERNEL_VERSION_" fi -ORIGINAL_INITRD_="$MULTIBOOT_PATH_/initrd.gz" +ORIGINAL_INITRD_="$MULTIBOOT_PATH_/initrd.img" MEMTEST_IMAGE_="$ADDONS_PATH_/memtest" if [ ! -f "$MEMTEST_IMAGE_" ] ; then