X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=default_config;h=aee7983ac87a3cf83fd786ec3d8bd121aa9e8d35;hb=608a4ec394f98c12e0cc5a8f36f80f3bdd5d5190;hp=cc1ef4b45e06df43751f09a8e43e8dd8c17e4d68;hpb=fdea9e5736375443ad3818136cab0bc41f9d9414;p=grml-terminalserver.git

diff --git a/default_config b/default_config
index cc1ef4b..aee7983 100644
--- a/default_config
+++ b/default_config
@@ -8,10 +8,12 @@ MODULES_PATH_="/lib/modules"
 
 KERNEL_VERSION_=`uname -r`
 
-if [ -e '/live/cow' ]; then
-  MOUNT_POINT_="/live/image"
+if [ -e /lib/live/mount/medium ] ; then
+  MOUNT_POINT_="/lib/live/mount/medium" # since around December 2012
+elif [ -e '/live/image' ]; then
+  MOUNT_POINT_="/live/image" # until around December 2012
 else
-  MOUNT_POINT_="/cdrom"
+  MOUNT_POINT_="/cdrom" # very old
 fi
 
 # assume we have a grml2usb system
@@ -39,8 +41,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 +51,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