projects
/
grml-terminalserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed breakage introduced by necessary changes because of isolinux problems
[grml-terminalserver.git]
/
default_config
diff --git
a/default_config
b/default_config
index
899a033
..
33a25ac
100644
(file)
--- a/
default_config
+++ b/
default_config
@@
-17,10
+17,17
@@
fi
DATA_PATH_="$MOUNT_POINT_/boot"
ISOLIN_PATH_="$DATA_PATH_/isolinux"
DATA_PATH_="$MOUNT_POINT_/boot"
ISOLIN_PATH_="$DATA_PATH_/isolinux"
+test -d $ISOLIN_PATH_ || ISOLIN_PATH_="$MOUNT_POINT_"
-ADDONS_PATH_="$DATA_PATH_/addons"
+ADDONS_PATH_="$(dirname $(find $MOUNT_POINT_ -maxdepth 3 -name memtest |head -n1))"
+if [[ $ADDONS_PATH_ == "" ]]; then
+ ADDONS_PATH_="$MOUNT_POINT_"
+fi
-MULTIBOOT_PATH_="$(dirname $(find $DATA_PATH_ -maxdepth 2 -name linux26))"
+MULTIBOOT_PATH_="$(dirname $(find $DATA_PATH_ -maxdepth 2 -name linux26 |head -n1))"
+if [[ $MULTIBOOT_PATH_ == "" ]]; then
+ MULTIBOOT_PATH_="$MOUNT_POINT_"
+fi
KERNEL_IMAGE_="$MULTIBOOT_PATH_/linux26"
KERNEL_IMAGE_="$MULTIBOOT_PATH_/linux26"