X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=default_config;h=e5e086308b80be2f0f7adb69eaf61c02ed589489;hb=cffa0e246e882acd9e7e9f51b50b30dd634a6a8a;hp=c6f88fcb1aa3f11d2e5f874ccaa003e38efe8641;hpb=cfab1646f2a34b52de5fd4afaddf97f71e7fab70;p=grml-terminalserver.git

diff --git a/default_config b/default_config
index c6f88fc..e5e0863 100644
--- a/default_config
+++ b/default_config
@@ -2,16 +2,12 @@
 # !!! DO NOT EDIT THIS FILE !!!
 # /etc/grml/terminalserver/config is what you are searching for
 
-MODULES_PATH_ROOT_DIFF_=""
-
-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 +35,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_="${DATA_PATH_}"
 else
   MULTIBOOT_PATH_="$MOUNT_POINT_"
 fi
@@ -49,11 +45,10 @@ if [[ $MULTIBOOT_PATH_ == "" ]]; then
   MULTIBOOT_PATH_="$MOUNT_POINT_"
 fi
 
-KERNEL_IMAGE_="$MULTIBOOT_PATH_/linux26"
-
-ORIGINAL_INITRD_="$MULTIBOOT_PATH_/initrd.gz"
-
 MEMTEST_IMAGE_="$ADDONS_PATH_/memtest"
+if [ ! -f "$MEMTEST_IMAGE_" ] ; then
+  MEMTEST_IMAGE_=$(find /boot -name memtest*.bin | head -n1)
+fi
 
 PXE_BOOT_MSG_="$ISOLIN_PATH_/boot.msg"
 # grml2usb with grub doesn't provide boot.msg, so generate a default one