change to /bin/bash [Closes: issue182]

diff --git a/.hgtags b/.hgtags
index 3992233..72dfbf6 100644 (file)
--- a/.hgtags
+++ b/.hgtags
@@ -25,3 +25,5 @@ cd0ee4845b9e2039f31b2ead8c83968a7262248c 0.85
 7b80c7a7b477ecadbac2742d37bec03a5bbedfaf 0.92
 288451ce72af278f83feb269f9f4177e79e1f7ba 0.94
 08ee09a02ec3c3d7e67d055c031864b42ae3a0f6 0.95
+3ef64cbe265a7e1c3fd477f2187df3c852095be7 0.96
+4173bb822e2b9bc6659f5d3a24ed33b3015ca6de 0.97

diff --git a/debian/changelog b/debian/changelog
index c0da887..7a2cb96 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,21 @@
-grml-terminalserver (0.96) UNRELEASED; urgency=low
+grml-terminalserver (0.98) UNRELEASED; urgency=low
 
-  * changed to /bin/bash [Closes: issue182]
+  * change to /bin/bash [Closes: issue182] 
 
- -- Michael Gebetsroither <gebi@grml.org>  Wed, 13 Feb 2008 14:01:54 +0100
+ -- Michael Gebetsroither <gebi@grml.org>  Wed, 17 Sep 2008 00:04:42 +0200
+
+grml-terminalserver (0.97) unstable; urgency=low
+
+  * Fixed breakage introduced by necessary changes because of isolinux
+    problems.
+
+ -- Michael Gebetsroither <gebi@grml.org>  Fri, 21 Mar 2008 19:19:59 +0100
+
+grml-terminalserver (0.96) unstable; urgency=low
+
+  * Fixed breakage introduced by boot layout change.
+
+ -- Michael Gebetsroither <gebi@grml.org>  Fri, 29 Feb 2008 01:38:04 +0100
 
 grml-terminalserver (0.95) unstable; urgency=low
 

diff --git a/default_config b/default_config
index a780804..33a25ac 100644 (file)
--- a/default_config
+++ b/default_config
@@ -14,17 +14,30 @@ else
   MOUNT_POINT_="/cdrom"
 fi
 
-DATA_PATH_="$MOUNT_POINT_/boot/isolinux"
+DATA_PATH_="$MOUNT_POINT_/boot"
 
-KERNEL_IMAGE_="$DATA_PATH_/linux26"
+ISOLIN_PATH_="$DATA_PATH_/isolinux"
+test -d $ISOLIN_PATH_ || ISOLIN_PATH_="$MOUNT_POINT_"
 
-ORIGINAL_INITRD_="$DATA_PATH_/minirt26.gz"
+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 |head -n1))"
+if [[ $MULTIBOOT_PATH_ == "" ]]; then
+    MULTIBOOT_PATH_="$MOUNT_POINT_"
+fi
+
+KERNEL_IMAGE_="$MULTIBOOT_PATH_/linux26"
+
+ORIGINAL_INITRD_="$MULTIBOOT_PATH_/initrd.gz"
 
-MEMTEST_IMAGE_="$DATA_PATH_/memtest"
+MEMTEST_IMAGE_="$ADDONS_PATH_/memtest"
 
-PXE_BOOT_MSG_="$DATA_PATH_/boot.msg"
+PXE_BOOT_MSG_="$ISOLIN_PATH_/boot.msg"
 
-PXE_BOOT_LOGO_="$DATA_PATH_/logo.16"
+PXE_BOOT_LOGO_="$ISOLIN_PATH_/logo.16"
 
 IPTABLES_SNAT_="true"