[Fai-commit] r6482 - branches/experimental/patches

[Michael Tautschnig]

Author: mt
Date: 2011-04-18 13:10:51 +0000 (Mon, 18 Apr 2011)
New Revision: 6482

Modified:
   branches/experimental/patches/bugfix-479537
   branches/experimental/patches/grub-pc
   branches/experimental/patches/setup-storage_more-verbose-parser
   branches/experimental/patches/setup-storage_preserve-in-place
Log:
Updated patches to match current trunk


Modified: branches/experimental/patches/bugfix-479537
===================================================================
--- branches/experimental/patches/bugfix-479537	2011-04-18 13:10:35 UTC (rev 6481)
+++ branches/experimental/patches/bugfix-479537	2011-04-18 13:10:51 UTC (rev 6482)
@@ -8,7 +8,7 @@
 ===================================================================
 --- trunk.orig/debian/NEWS
 +++ trunk/debian/NEWS
-@@ -14,6 +14,9 @@
+@@ -38,6 +38,9 @@
    - files named package_config/*.asc are added to the list of apt keys
    - cvs, bootpc, expect and mdetect are not installed by default into the
      nfsroot

Modified: branches/experimental/patches/grub-pc
===================================================================
--- branches/experimental/patches/grub-pc	2011-04-18 13:10:35 UTC (rev 6481)
+++ branches/experimental/patches/grub-pc	2011-04-18 13:10:51 UTC (rev 6482)
@@ -19,16 +19,6 @@
  PACKAGES aptitude LILO
 -lilo grub-
 +lilo grub-legacy- grub-pc-
-Index: trunk/examples/simple/class/50-host-classes
-===================================================================
---- trunk.orig/examples/simple/class/50-host-classes
-+++ trunk/examples/simple/class/50-host-classes
-@@ -25,5 +25,4 @@
- 	echo "FAIBASE DEBIAN DHCPC" ;;
- esac
- 
--(ifclass I386 || ifclass AMD64) && echo GRUB 
- exit 0
 Index: trunk/examples/simple/class/51-grub
 ===================================================================
 --- /dev/null

Modified: branches/experimental/patches/setup-storage_more-verbose-parser
===================================================================
--- branches/experimental/patches/setup-storage_more-verbose-parser	2011-04-18 13:10:35 UTC (rev 6481)
+++ branches/experimental/patches/setup-storage_more-verbose-parser	2011-04-18 13:10:51 UTC (rev 6482)
@@ -6,7 +6,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Parser.pm
 +++ trunk/lib/setup-storage/Parser.pm
-@@ -620,12 +620,15 @@
+@@ -616,12 +616,15 @@
            }
            $FAI::configs{$FAI::device}{preserveparts} = 1;
          }

Modified: branches/experimental/patches/setup-storage_preserve-in-place
===================================================================
--- branches/experimental/patches/setup-storage_preserve-in-place	2011-04-18 13:10:35 UTC (rev 6481)
+++ branches/experimental/patches/setup-storage_preserve-in-place	2011-04-18 13:10:51 UTC (rev 6482)
@@ -7,7 +7,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Parser.pm
 +++ trunk/lib/setup-storage/Parser.pm
-@@ -861,7 +861,7 @@
+@@ -862,7 +862,7 @@
            1;
          }
  
@@ -16,7 +16,7 @@
          {
            # complete the size specification to be a range in all cases
            my $range = $1;
-@@ -886,13 +886,20 @@
+@@ -887,13 +887,20 @@
            $range = "$min-$max";
            # enter the range into the hash
            $FAI::partition_pointer->{size}->{range} = $range;
@@ -40,7 +40,7 @@
          {
            # complete the range by assuming 0 as the lower limit 
            my $range = "0$1";
-@@ -905,10 +912,17 @@
+@@ -906,10 +913,17 @@
            $range = "$min-$max";
            # enter the range into the hash
            $FAI::partition_pointer->{size}->{range} = $range;