projects
/
grml-terminalserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of code which breaks Multi-ISO boot [Testing: issue1273]
[grml-terminalserver.git]
/
default_config
diff --git
a/default_config
b/default_config
index
aee7983
..
e5e0863
100644
(file)
--- a/
default_config
+++ b/
default_config
@@
-2,12
+2,6
@@
# !!! DO NOT EDIT THIS FILE !!!
# /etc/grml/terminalserver/config is what you are searching for
# !!! 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
if [ -e /lib/live/mount/medium ] ; then
MOUNT_POINT_="/lib/live/mount/medium" # since around December 2012
elif [ -e '/live/image' ]; then
@@
-42,7
+36,7
@@
if [[ $ADDONS_PATH_ == "" ]]; then
fi
if [[ "$(find $DATA_PATH_/ -maxdepth 2 -name vmlinuz |head -n1)" != "" ]] ; 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
else
MULTIBOOT_PATH_="$MOUNT_POINT_"
fi
@@
-51,14
+45,6
@@
if [[ $MULTIBOOT_PATH_ == "" ]]; then
MULTIBOOT_PATH_="$MOUNT_POINT_"
fi
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)
MEMTEST_IMAGE_="$ADDONS_PATH_/memtest"
if [ ! -f "$MEMTEST_IMAGE_" ] ; then
MEMTEST_IMAGE_=$(find /boot -name memtest*.bin | head -n1)