From 3f792211f621bcf2a08f7bb6f886bac7ad712134 Mon Sep 17 00:00:00 2001 From: Michael Gebetsroither Date: Fri, 21 Mar 2008 19:30:05 +0100 Subject: [PATCH] Fixed breakage introduced by necessary changes because of isolinux problems --- debian/changelog | 7 +++++++ default_config | 11 +++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ffb9bf6..045ed16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +grml-terminalserver (0.97) unstable; urgency=low + + * Fixed breakage introduced by necessary changes because of isolinux + problems. + + -- Michael Gebetsroither Fri, 21 Mar 2008 19:19:59 +0100 + grml-terminalserver (0.96) unstable; urgency=low * Fixed breakage introduced by boot layout change. diff --git a/default_config b/default_config index 899a033..33a25ac 100644 --- a/default_config +++ b/default_config @@ -17,10 +17,17 @@ fi 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" -- 2.1.4