projects
/
grml-terminalserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix usage of rpcinfo being available inside /usr/sbin nowadays [Closes: issue1274]
[grml-terminalserver.git]
/
default_config
diff --git
a/default_config
b/default_config
index
cc1ef4b
..
aee7983
100644
(file)
--- a/
default_config
+++ b/
default_config
@@
-8,10
+8,12
@@
MODULES_PATH_="/lib/modules"
KERNEL_VERSION_=`uname -r`
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
else
- MOUNT_POINT_="/cdrom"
+ MOUNT_POINT_="/cdrom"
# very old
fi
# assume we have a grml2usb system
fi
# assume we have a grml2usb system
@@
-39,8
+41,8
@@
if [[ $ADDONS_PATH_ == "" ]]; then
ADDONS_PATH_="$MOUNT_POINT_"
fi
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
else
MULTIBOOT_PATH_="$MOUNT_POINT_"
fi
@@
-49,13
+51,13
@@
if [[ $MULTIBOOT_PATH_ == "" ]]; then
MULTIBOOT_PATH_="$MOUNT_POINT_"
fi
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
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
MEMTEST_IMAGE_="$ADDONS_PATH_/memtest"
if [ ! -f "$MEMTEST_IMAGE_" ] ; then