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

[Michael Tautschnig]

Author: mt
Date: 2009-10-30 10:36:29 +0000 (Fri, 30 Oct 2009)
New Revision: 5625

Added:
   people/michael/experimental/patches/setup-storage_lvm-on-entire-disk
Modified:
   people/michael/experimental/patches/bugfix-479537
   people/michael/experimental/patches/grub-pc
   people/michael/experimental/patches/series
Log:
Updated patches to match current trunk and added new patch for setup-storage to
work with LVM/RAID on entire disks


Modified: people/michael/experimental/patches/bugfix-479537
===================================================================
--- people/michael/experimental/patches/bugfix-479537	2009-10-30 10:29:49 UTC (rev 5624)
+++ people/michael/experimental/patches/bugfix-479537	2009-10-30 10:36:29 UTC (rev 5625)
@@ -8,15 +8,15 @@
 ===================================================================
 --- trunk.orig/debian/NEWS
 +++ trunk/debian/NEWS	
-@@ -5,6 +5,9 @@
+@@ -6,6 +6,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
-   - dirinstall now uses FAI_CONFIG_SRC instead of FAI_CONFIGDIR
 +  - Changed semantics of class lists in PACKAGES (install|aptitude|...) to
 +    Boolean AND and added support for negation (using !), see also
 +    https://lists.uni-koeln.de/pipermail/linux-fai-devel/2008q2/000530.html
    
-  -- Thomas Lange <lange at debian.org>  Tue, 20 Oct 2009 12:33:43 +0200
+  -- Thomas Lange <lange at debian.org>  Fri, 23 Oct 2009 14:07:07 +0200
  
 Index: trunk/bin/install_packages
 ===================================================================

Modified: people/michael/experimental/patches/grub-pc
===================================================================
--- people/michael/experimental/patches/grub-pc	2009-10-30 10:29:49 UTC (rev 5624)
+++ people/michael/experimental/patches/grub-pc	2009-10-30 10:36:29 UTC (rev 5625)
@@ -13,8 +13,8 @@
  	cp -a examples $(DOCDIR)
 +	chmod -R a+x $(DOCDIR)/examples/simple/scripts/
  	cp -a utils $(DOCDIR)/examples
+ 	find $(DOCDIR) -name .svn | xargs rm -rf
  
- .PHONY: clean veryclean
 Index: trunk/examples/simple/package_config/DEFAULT
 ===================================================================
 --- trunk.orig/examples/simple/package_config/DEFAULT

Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series	2009-10-30 10:29:49 UTC (rev 5624)
+++ people/michael/experimental/patches/series	2009-10-30 10:36:29 UTC (rev 5625)
@@ -5,3 +5,4 @@
 bugfix-479537
 setup-storage_full-crypto-support
 setup-storage_no-cylinder-boundaries
+setup-storage_lvm-on-entire-disk

Added: people/michael/experimental/patches/setup-storage_lvm-on-entire-disk
===================================================================
--- people/michael/experimental/patches/setup-storage_lvm-on-entire-disk	                        (rev 0)
+++ people/michael/experimental/patches/setup-storage_lvm-on-entire-disk	2009-10-30 10:36:29 UTC (rev 5625)
@@ -0,0 +1,35 @@
+2009-10-30  Michael Tautschnig  <mt at debian.org>
+
+	* setup-storage/Parser.pm: LVM volume groups or RAID arrays may now refer to
+		diskX to use the entire disk (thanks Mathieu Alorent).
+Index: trunk/lib/setup-storage/Parser.pm
+===================================================================
+--- trunk.orig/lib/setup-storage/Parser.pm
++++ trunk/lib/setup-storage/Parser.pm	
+@@ -614,6 +614,8 @@
+             unless ($dev =~ m{^/}) {
+               if ($dev =~ m/^disk(\d+)\.(\d+)/) {
+                 $dev = &FAI::make_device_name("/dev/" . $FAI::disks[ $1 - 1 ], $2);
++              } elsif ($dev =~ m/^disk(\d+)/) {
++                $dev = "/dev/" . $FAI::disks[ $1 - 1 ];
+               } else {
+                 $dev = "/dev/$dev";
+               }
+Index: trunk/lib/setup-storage/Commands.pm
+===================================================================
+--- trunk.orig/lib/setup-storage/Commands.pm
++++ trunk/lib/setup-storage/Commands.pm	
+@@ -151,9 +151,10 @@
+   # make sure this device really exists (we can't check for the partition
+   # as that may be created later on
+   (-b $disk) or die "Specified disk $disk does not exist in this system!\n";
+-  # set the raid flag
+-  &FAI::push_command( "parted -s $disk set $part_no $t on", "exist_$d",
+-    "type_${t}_$d" );
++  # set the raid/lvm unless this is an entire disk flag
++  my $cmd = "parted -s $disk set $part_no $t on";
++  $cmd = "true" if ($part_no == -1);
++  &FAI::push_command( $cmd, "exist_$d", "type_${t}_$d" );
+ }
+ 
+ ################################################################################