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

[Thomas Lange]

Author: lange
Date: 2009-11-13 21:39:24 +0000 (Fri, 13 Nov 2009)
New Revision: 5657

Modified:
   trunk/debian/changelog
   trunk/lib/setup-storage/Commands.pm
   trunk/lib/setup-storage/Fstab.pm
Log:
* Commands.pm: add ext4 support for tune2fs
* Fstab: do not fsck swap partitions

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-11-13 21:03:34 UTC (rev 5656)
+++ trunk/debian/changelog	2009-11-13 21:39:24 UTC (rev 5657)
@@ -2,6 +2,8 @@
 
   [ Thomas Lange ]
   * doc/Makefile: add target chunked
+  * Commands.pm: add ext4 support for tune2fs
+  * Fstab: do not fsck swap partitions
 
  -- Thomas Lange <lange at debian.org>  Fri, 13 Nov 2009 17:37:07 +0100
 

Modified: trunk/lib/setup-storage/Commands.pm
===================================================================
--- trunk/lib/setup-storage/Commands.pm	2009-11-13 21:03:34 UTC (rev 5656)
+++ trunk/lib/setup-storage/Commands.pm	2009-11-13 21:39:24 UTC (rev 5657)
@@ -79,7 +79,7 @@
   # supports tuning at all
   return unless $tune_options;
   my $tune_tool;
-  ($fs eq "ext2" || $fs eq "ext3") and $tune_tool = "tune2fs";
+  ($fs eq "ext2" || $fs eq "ext3" || $fs eq "ext4") and $tune_tool = "tune2fs";
   ($fs eq "reiserfs") and $tune_tool = "reiserfstune";
   die "Don't know how to tune $fs\n" unless $tune_tool;
 

Modified: trunk/lib/setup-storage/Fstab.pm
===================================================================
--- trunk/lib/setup-storage/Fstab.pm	2009-11-13 21:03:34 UTC (rev 5656)
+++ trunk/lib/setup-storage/Fstab.pm	2009-11-13 21:39:24 UTC (rev 5657)
@@ -58,8 +58,9 @@
   push @fstab_line, ($d_ref->{mountpoint}, $d_ref->{filesystem},
     $d_ref->{mount_options}, 0, 2);
   # order of filesystem checks: the root filesystem gets a 1, the others
-  # got 2
+  # get 2, swap gets 0
   $fstab_line[-1] = 1 if ($d_ref->{mountpoint} eq "/");
+  $fstab_line[-1] = 0 if ($d_ref->{mountpoint} eq "swap");
 
   # set the ROOT_PARTITION variable, if this is the mountpoint for /
   $FAI::disk_var{ROOT_PARTITION} = $name