Release new version 0.105.0

[grml-terminalserver.git] / default_config

diff --git a/default_config b/default_config
index 33a25ac..62da7f7 100644 (file)
--- a/default_config
+++ b/default_config
@@ -2,42 +2,66 @@
 # !!! 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 /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
 
-if [ -e '/live/cow' ]; then
-  MOUNT_POINT_="/live/image"
-else
-  MOUNT_POINT_="/cdrom"
+# assume we have a grml2usb system
+if [ -d "$MOUNT_POINT_"/boot/release ] ; then
+  DATA_PATH_="$MOUNT_POINT_/boot/release"
+else # no grml2usb but running from CD
+  DATA_PATH_="$MOUNT_POINT_/boot"
 fi
 
-DATA_PATH_="$MOUNT_POINT_/boot"
+# new grml2usb layout
+if [ -d "$MOUNT_POINT_"/boot/syslinux ] ; then
+  ISOLIN_PATH_="$MOUNT_POINT_/boot/syslinux"
+  test -d $ISOLIN_PATH_ || ISOLIN_PATH_="$MOUNT_POINT_"
+else # old layout
+  ISOLIN_PATH_="$DATA_PATH_/isolinux"
+  test -d $ISOLIN_PATH_ || ISOLIN_PATH_="$MOUNT_POINT_"
+fi
 
-ISOLIN_PATH_="$DATA_PATH_/isolinux"
-test -d $ISOLIN_PATH_ || ISOLIN_PATH_="$MOUNT_POINT_"
+# addons
+if [[ "$(find $MOUNT_POINT_ -maxdepth 3 -name memtest |head -n1)" != "" ]] ; then
+  ADDONS_PATH_="$(dirname $(find $MOUNT_POINT_ -maxdepth 3 -name memtest |head -n1))"
+fi
 
-ADDONS_PATH_="$(dirname $(find $MOUNT_POINT_ -maxdepth 3 -name memtest |head -n1))"
 if [[ $ADDONS_PATH_ == "" ]]; then
-    ADDONS_PATH_="$MOUNT_POINT_"
+  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_"
+if [[ "$(find $DATA_PATH_/ -maxdepth 2 -name vmlinuz |head -n1)" != "" ]] ; then
+  MULTIBOOT_PATH_="${DATA_PATH_}"
+else
+  MULTIBOOT_PATH_="$MOUNT_POINT_"
 fi
 
-KERNEL_IMAGE_="$MULTIBOOT_PATH_/linux26"
-
-ORIGINAL_INITRD_="$MULTIBOOT_PATH_/initrd.gz"
+if [[ $MULTIBOOT_PATH_ == "" ]]; then
+  MULTIBOOT_PATH_="$MOUNT_POINT_"
+fi
 
 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
+if ! [ -f "$PXE_BOOT_MSG_" ] ; then
+  PXE_BOOT_MSG_="$(mktemp)"
+  cat > $PXE_BOOT_MSG_ << EOF
+\ f17\f\18logo.16
+
+Some information and boot options available via keys F2 - F10. http://grml.org/
+
+EOF
+fi
 
 PXE_BOOT_LOGO_="$ISOLIN_PATH_/logo.16"
 
 IPTABLES_SNAT_="true"
 
+# EOF