From: Michael Gebetsroither <michael.geb@gmx.at>
Date: Wed, 27 Feb 2008 12:32:46 +0000 (+0100)
Subject: fixed breakage introduced by boot layout change
X-Git-Tag: 0.96~2
X-Git-Url: http://git.grml.org/?p=grml-terminalserver.git;a=commitdiff_plain;h=f8f76d8a8b51acb0a69bbbf94e2cc5df092e7dce

fixed breakage introduced by boot layout change
---

diff --git a/debian/changelog b/debian/changelog
index e6e433a..8c4ba04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-terminalserver (0.96) UNRELEASED; urgency=low
+
+  * Fixed breakage introduced by boot layout change.
+
+ -- Michael Gebetsroither <gebi@grml.org>  Wed, 27 Feb 2008 13:29:02 +0100
+
 grml-terminalserver (0.95) unstable; urgency=low
 
   [ Michael Gebetsroither ]
diff --git a/default_config b/default_config
index a780804..f61eac6 100644
--- a/default_config
+++ b/default_config
@@ -14,17 +14,21 @@ 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"
 
-ORIGINAL_INITRD_="$DATA_PATH_/minirt26.gz"
+ADDONS_PATH_="$DATA_PATH_/addons"
 
-MEMTEST_IMAGE_="$DATA_PATH_/memtest"
+KERNEL_IMAGE_="$DATA_PATH_/grml/linux26"
 
-PXE_BOOT_MSG_="$DATA_PATH_/boot.msg"
+ORIGINAL_INITRD_="$DATA_PATH_/grml/initrd.gz"
 
-PXE_BOOT_LOGO_="$DATA_PATH_/logo.16"
+MEMTEST_IMAGE_="$ADDONS_PATH_/memtest"
+
+PXE_BOOT_MSG_="$ISOLIN_PATH_/boot.msg"
+
+PXE_BOOT_LOGO_="$ISOLIN_PATH_/logo.16"
 
 IPTABLES_SNAT_="true"