[Fai-commit] r5383 - people/michael/experimental/patches

[Michael Tautschnig]

Author: mt
Date: 2009-04-30 07:33:55 +0000 (Thu, 30 Apr 2009)
New Revision: 5383

Added:
   people/michael/experimental/patches/setup-storage_better-error-msg
Modified:
   people/michael/experimental/patches/grub-pc
   people/michael/experimental/patches/series
Log:
- improved user error message
- fixed grub-pc install script (thanks Jean Spirat)


Modified: people/michael/experimental/patches/grub-pc
===================================================================
--- people/michael/experimental/patches/grub-pc	2009-04-28 13:09:30 UTC (rev 5382)
+++ people/michael/experimental/patches/grub-pc	2009-04-30 07:33:55 UTC (rev 5383)
@@ -1,8 +1,7 @@
-2008-10-16  Michael Tautschnig  <mt at debian.org>
+2009-04-29  Michael Tautschnig  <mt at debian.org>
 
 	* simple example: Added class GRUB_PC that installs and uses grub-pc instead
 		of grub, following the suggestions of Jean Spirat <jeanspirat at squirk.org>.
-		This is untested.
 	* Makefile: Make sure that all example scripts are executable
 Index: trunk/Makefile
 ===================================================================
@@ -58,7 +57,7 @@
 +if [ -z "$grub_dev" ] ; then
 +  grub_dev=$(echo $BOOT_DEVICE | sed 's#^/dev/##')
 +fi
-+$ROOTCMD /usr/sbin/grub-install "($grub_dev)"
++$ROOTCMD /usr/sbin/grub-install --modules="ext2 _chain pc gpt biosdisk lvm raid serial" "($grub_dev)"
 +$ROOTCMD /usr/sbin/grub-setup   "($grub_dev)"
 +$ROOTCMD /usr/sbin/update-grub
 +

Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series	2009-04-28 13:09:30 UTC (rev 5382)
+++ people/michael/experimental/patches/series	2009-04-30 07:33:55 UTC (rev 5383)
@@ -1,3 +1,4 @@
+setup-storage_better-error-msg
 logtail
 grub-pc
 bugfix-506459

Added: people/michael/experimental/patches/setup-storage_better-error-msg
===================================================================
--- people/michael/experimental/patches/setup-storage_better-error-msg	                        (rev 0)
+++ people/michael/experimental/patches/setup-storage_better-error-msg	2009-04-30 07:33:55 UTC (rev 5383)
@@ -0,0 +1,17 @@
+2009-04-30  Michael Tautschnig  <mt at debian.org>
+
+	* setup-storage/Sizes.pm: Clarified error message in cases where the user
+		specified a partition is larger than the entire disk
+Index: trunk/lib/setup-storage/Sizes.pm
+===================================================================
+--- trunk.orig/lib/setup-storage/Sizes.pm
++++ trunk/lib/setup-storage/Sizes.pm	
+@@ -74,7 +74,7 @@
+   }
+ 
+   # the user may have specified a partition that is larger than the entire disk
+-  ($start <= $size_b) or die "Lower bound of partition size is greater than disk size\n";
++  ($start <= $size_b) or die "Sorry, can't create a partition of $start B on a disk of $size_b B - check your config!\n";
+   # make sure that $end >= $start
+   ($end >= $start) or &FAI::internal_error("end < start");
+