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

[Michael Tautschnig]

Author: mt
Date: 2010-01-26 22:55:31 +0000 (Tue, 26 Jan 2010)
New Revision: 5700

Removed:
   people/michael/experimental/patches/setup-storage_reiserfs-fix
Modified:
   people/michael/experimental/patches/series
   people/michael/experimental/patches/setup-storage_lvm-preserve2
Log:
updated experimental to match current trunk after merge


Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series	2010-01-26 22:55:04 UTC (rev 5699)
+++ people/michael/experimental/patches/series	2010-01-26 22:55:31 UTC (rev 5700)
@@ -9,4 +9,3 @@
 setup-storage_lvm-preserve2
 bugfix-558139
 setup-storage_GIB-support
-setup-storage_reiserfs-fix

Modified: people/michael/experimental/patches/setup-storage_lvm-preserve2
===================================================================
--- people/michael/experimental/patches/setup-storage_lvm-preserve2	2010-01-26 22:55:04 UTC (rev 5699)
+++ people/michael/experimental/patches/setup-storage_lvm-preserve2	2010-01-26 22:55:31 UTC (rev 5700)
@@ -2,7 +2,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Commands.pm
 +++ trunk/lib/setup-storage/Commands.pm	
-@@ -354,6 +354,7 @@
+@@ -355,6 +355,7 @@
            ($FAI::configs{"PHY_$disk"}{partitions}{$part_no}{size}{preserve}) and
            next;
        }
@@ -10,7 +10,7 @@
        $vg_exists = 0;
        last;
      }
-@@ -395,7 +396,7 @@
+@@ -396,7 +397,7 @@
    my @new_devices = ();
    push @new_devices, &FAI::enc_name($_) foreach (keys %new_devs);
  

Deleted: people/michael/experimental/patches/setup-storage_reiserfs-fix
===================================================================
--- people/michael/experimental/patches/setup-storage_reiserfs-fix	2010-01-26 22:55:04 UTC (rev 5699)
+++ people/michael/experimental/patches/setup-storage_reiserfs-fix	2010-01-26 22:55:31 UTC (rev 5700)
@@ -1,16 +0,0 @@
-2010-01-13  Michael Tautschnig  <mt at debian.org>
-
-	* setup-storage/Commands.pm: Add -q to createopts when making reiser file
-		systems (thanks Mathieu Alorent and Thomas Neumann).
-Index: trunk/lib/setup-storage/Commands.pm
-===================================================================
---- trunk.orig/lib/setup-storage/Commands.pm
-+++ trunk/lib/setup-storage/Commands.pm	
-@@ -70,6 +70,7 @@
-   my $create_tool = "mkfs.$fs";
-   ($fs eq "swap") and $create_tool = "mkswap";
-   ($fs eq "xfs") and $create_options = "$create_options -f" unless ($create_options =~ m/-f/);
-+  ($fs eq "reiserfs") and $create_options = "$create_options -q" unless ($create_options =~ m/-(f|q|y)/);
-   &FAI::push_command( "$create_tool $create_options $device", "exist_$device",
-     "has_fs_$device" );
-