X-Git-Url: http://git.grml.org/?p=grml-terminalserver.git;a=blobdiff_plain;f=default_config;h=62da7f7ccd76c0e90ca1ea809c9c38f50433543b;hp=aee7983ac87a3cf83fd786ec3d8bd121aa9e8d35;hb=HEAD;hpb=77804b1e60fa001a4683c7f4336b77a03601aea3

diff --git a/default_config b/default_config
index aee7983..62da7f7 100644
--- a/default_config
+++ b/default_config
@@ -2,18 +2,10 @@
 # !!! 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 /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" # very old
+if [ -e /run/live/medium ] ; then
+  MOUNT_POINT_='/run/live/medium' # since Dec. 2018
+elif [ -e /lib/live/mount/medium ] ; then
+  MOUNT_POINT_="/lib/live/mount/medium"
 fi
 
 # assume we have a grml2usb system
@@ -42,7 +34,7 @@ if [[ $ADDONS_PATH_ == "" ]]; then
 fi
 
 if [[ "$(find $DATA_PATH_/ -maxdepth 2 -name vmlinuz |head -n1)" != "" ]] ; then
-  MULTIBOOT_PATH_="$(dirname $(find $DATA_PATH_ -maxdepth 2 -name vmlinuz |head -n1))"
+  MULTIBOOT_PATH_="${DATA_PATH_}"
 else
   MULTIBOOT_PATH_="$MOUNT_POINT_"
 fi
@@ -51,14 +43,6 @@ if [[ $MULTIBOOT_PATH_ == "" ]]; then
   MULTIBOOT_PATH_="$MOUNT_POINT_"
 fi
 
-KERNEL_IMAGE_="$MULTIBOOT_PATH_/vmlinuz"
-
-if [[ ! -f "$KERNEL_IMAGE_" ]] ; then
-  KERNEL_IMAGE_="/boot/vmlinuz-$KERNEL_VERSION_"
-fi
-
-ORIGINAL_INITRD_="$MULTIBOOT_PATH_/initrd.img"
-
 MEMTEST_IMAGE_="$ADDONS_PATH_/memtest"
 if [ ! -f "$MEMTEST_IMAGE_" ] ; then
   MEMTEST_IMAGE_=$(find /boot -name memtest*.bin | head -n1)