[Fai-commit] r5699 - in trunk: debian lib/setup-storage

[Michael Tautschnig]

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

Modified:
   trunk/debian/changelog
   trunk/lib/setup-storage/Commands.pm
Log:
merged reiserfs mkfs fix into trunk


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-01-18 10:44:04 UTC (rev 5698)
+++ trunk/debian/changelog	2010-01-26 22:55:04 UTC (rev 5699)
@@ -25,6 +25,8 @@
     limitiation (thanks Mattias Jansson for proving me wrong).
   * disk-info, setup-storage/Init.pm: Also accept Xen's xvd[a-t] as valid disk
     name (thanks Rudy Gevaert for the patch). (closes: #561489)
+  * setup-storage/Commands.pm: Add -q to createopts when making reiser file
+    systems (thanks Mathieu Alorent and Thomas Neumann).
 
  -- Thomas Lange <lange at debian.org>  Mon, 18 Jan 2010 11:43:53 +0100
 

Modified: trunk/lib/setup-storage/Commands.pm
===================================================================
--- trunk/lib/setup-storage/Commands.pm	2010-01-18 10:44:04 UTC (rev 5698)
+++ trunk/lib/setup-storage/Commands.pm	2010-01-26 22:55:04 UTC (rev 5699)
@@ -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" );