From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Sun, 14 Oct 2007 10:59:34 +0000 (+0000)
Subject: Der Grub findet leider ohne diesen Patch nicht die richtige Partition.
X-Git-Tag: v2.3-beta1~315
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=d4cf6d647ae46e5641b4e6440491c0c9fb33f235

Der Grub findet leider ohne diesen Patch nicht die richtige Partition.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@969 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---

diff --git a/lfs/grub b/lfs/grub
index 190488a2f3..979dbe9d2c 100644
--- a/lfs/grub
+++ b/lfs/grub
@@ -78,6 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.93-graphics-bootterm.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-xpmjunk.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-splash-error-term.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.93-special-device-names.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-moreraid.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.94-i2o.patch
 
@@ -96,8 +97,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	for i in $(DIR_SRC)/config/grub/*; do \
 	    [ -f $$i ] && cp -f $$i /boot/grub; \
 	done
-	
-	/usr/sbin/grub-set-default 1
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/src/patches/grub-0.93-special-device-names.patch b/src/patches/grub-0.93-special-device-names.patch
new file mode 100644
index 0000000000..894f3e8872
--- /dev/null
+++ b/src/patches/grub-0.93-special-device-names.patch
@@ -0,0 +1,18 @@
+--- grub-0.93/lib/device.c.raid	2002-05-20 05:53:46.000000000 -0400
++++ grub-0.93/lib/device.c	2002-12-28 23:24:10.000000000 -0500
+@@ -689,7 +689,14 @@
+       if (strcmp (dev + strlen(dev) - 5, "/disc") == 0)
+ 	strcpy (dev + strlen(dev) - 5, "/part");
+     }
+-  sprintf (dev + strlen(dev), "%d", ((partition >> 16) & 0xFF) + 1);
++
++  sprintf (dev + strlen(dev), "%s%d", 
++	   /* Compaq smart and others */
++	   (strncmp(dev, "/dev/ida/", 9) == 0 ||
++	    strncmp(dev, "/dev/ataraid/", 13) == 0 ||
++	    strncmp(dev, "/dev/cciss/", 11) == 0 ||
++	    strncmp(dev, "/dev/rd/", 8) == 0) ? "p" : "",
++	   ((partition >> 16) & 0xFF) + 1);
+   
+   /* Open the partition.  */
+   fd = open (dev, O_RDWR);