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

Michael Tautschnig mt at alioth.debian.org
Tue Jul 6 05:33:14 UTC 2010 

Author: mt
Date: 2010-07-06 05:32:59 +0000 (Tue, 06 Jul 2010)
New Revision: 5842

Modified:
   branches/experimental/patches/bugfix-479537
   branches/experimental/patches/fix-eval_cmdline
   branches/experimental/patches/grub-pc
   branches/experimental/patches/logtail
   branches/experimental/patches/setup-storage_always-format
   branches/experimental/patches/setup-storage_external-journal
   branches/experimental/patches/setup-storage_lvm-preserve2
   branches/experimental/patches/setup-storage_preserve-lazy
   branches/experimental/patches/setup-storage_ramsize
   branches/experimental/patches/setup-storage_tmpfs
Log:
Updated patches to match last weekend's work


Modified: branches/experimental/patches/bugfix-479537
===================================================================
--- branches/experimental/patches/bugfix-479537	2010-07-04 14:21:44 UTC (rev 5841)
+++ branches/experimental/patches/bugfix-479537	2010-07-06 05:32:59 UTC (rev 5842)
@@ -22,7 +22,7 @@
 ===================================================================
 --- trunk.orig/bin/install_packages
 +++ trunk/bin/install_packages	
-@@ -274,13 +274,21 @@
+@@ -275,13 +275,21 @@
        # by default no classes are listed after this command so doit
        $doit = 1;
        if ($cllist) {

Modified: branches/experimental/patches/fix-eval_cmdline
===================================================================
--- branches/experimental/patches/fix-eval_cmdline	2010-07-04 14:21:44 UTC (rev 5841)
+++ branches/experimental/patches/fix-eval_cmdline	2010-07-06 05:32:59 UTC (rev 5842)
@@ -7,7 +7,7 @@
 ===================================================================
 --- trunk.orig/lib/subroutines
 +++ trunk/lib/subroutines	
-@@ -643,18 +643,22 @@
+@@ -651,18 +651,22 @@
      echo -n "Kernel currently running: "
      uname -rsmo
      echo -n "Kernel parameters: "; cat /proc/cmdline

Modified: branches/experimental/patches/grub-pc
===================================================================
--- branches/experimental/patches/grub-pc	2010-07-04 14:21:44 UTC (rev 5841)
+++ branches/experimental/patches/grub-pc	2010-07-06 05:32:59 UTC (rev 5842)
@@ -250,7 +250,7 @@
 ===================================================================
 --- trunk.orig/man/setup-storage.8
 +++ trunk/man/setup-storage.8	
-@@ -106,10 +106,9 @@
+@@ -111,10 +111,9 @@
  .IR SWAPLIST ,
  .IR ROOT_PARTITION ,
  .IR BOOT_PARTITION

Modified: branches/experimental/patches/logtail
===================================================================
--- branches/experimental/patches/logtail	2010-07-04 14:21:44 UTC (rev 5841)
+++ branches/experimental/patches/logtail	2010-07-06 05:32:59 UTC (rev 5842)
@@ -45,7 +45,7 @@
  }
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  jobsrunning() {
-@@ -428,6 +432,7 @@
+@@ -436,6 +440,7 @@
  task_savelog() {
  
      mkdir -p $FAI_ROOT/var/{lib,log}/fai

Modified: branches/experimental/patches/setup-storage_always-format
===================================================================
--- branches/experimental/patches/setup-storage_always-format	2010-07-04 14:21:44 UTC (rev 5841)
+++ branches/experimental/patches/setup-storage_always-format	2010-07-06 05:32:59 UTC (rev 5842)
@@ -128,7 +128,7 @@
 ===================================================================
 --- trunk.orig/man/setup-storage.8
 +++ trunk/man/setup-storage.8	
-@@ -169,6 +169,10 @@
+@@ -174,6 +174,10 @@
  .br
             /* preserve volumes -- unless these don't exist yet */
  .br
@@ -139,7 +139,7 @@
             | resize:[^/,\\s\\-]+-[^/,\\s\\-]+(,[^/,\\s\\-]+-[^/,\\s\\-]+)*
  .br
             /* attempt to resize partitions */
-@@ -199,6 +203,10 @@
+@@ -204,6 +208,10 @@
  .br
             /* preserve volumes -- unless these don't exist yet */
  .br
@@ -150,7 +150,7 @@
             | fstabkey:(device|label|uuid)
  .br
             /* when creating the fstab the key used for defining the device
-@@ -233,6 +241,10 @@
+@@ -238,6 +246,10 @@
  .br
             /* preserve partitions -- unless these don't exist yet */
  .br
@@ -161,7 +161,7 @@
             | resize:[[:digit:]]+(,[[:digit:]]+)*
  .br
             /* attempt to resize partitions */
-@@ -397,6 +409,9 @@
+@@ -402,6 +414,9 @@
  one of the FAI_FLAGS. preserve_lazy allows to preserve partitions only if these
  exist already. Otherwise they are created.
  .IP \(bu

Modified: branches/experimental/patches/setup-storage_external-journal
===================================================================
--- branches/experimental/patches/setup-storage_external-journal	2010-07-04 14:21:44 UTC (rev 5841)
+++ branches/experimental/patches/setup-storage_external-journal	2010-07-06 05:32:59 UTC (rev 5842)
@@ -123,7 +123,7 @@
 ===================================================================
 --- trunk.orig/man/setup-storage.8
 +++ trunk/man/setup-storage.8	
-@@ -537,6 +537,33 @@
+@@ -542,6 +542,33 @@
  .IP \(bu
  Mount a tmpfs on /scratch with a maximum size of 3 GiB.
  

Modified: branches/experimental/patches/setup-storage_lvm-preserve2
===================================================================
--- branches/experimental/patches/setup-storage_lvm-preserve2	2010-07-04 14:21:44 UTC (rev 5841)
+++ branches/experimental/patches/setup-storage_lvm-preserve2	2010-07-06 05:32:59 UTC (rev 5842)
@@ -3,7 +3,8 @@
 	* setup-storage/{Commands.pm,Volumes.pm}: Completed support for preserve in
 		LVM/RAID contexts; extended checking for volume groups that remain alive,
 		fixed bug in LV resize code, disable existing volume groups, remove
-		non-preserved volume groups.
+		non-preserved volume groups (thanks Mathieu Alorent <malorent at echo.fr> for
+		extensive testing).
 Index: trunk/lib/setup-storage/Commands.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Commands.pm

Modified: branches/experimental/patches/setup-storage_preserve-lazy
===================================================================
--- branches/experimental/patches/setup-storage_preserve-lazy	2010-07-04 14:21:44 UTC (rev 5841)
+++ branches/experimental/patches/setup-storage_preserve-lazy	2010-07-06 05:32:59 UTC (rev 5842)
@@ -134,7 +134,7 @@
 ===================================================================
 --- trunk.orig/man/setup-storage.8
 +++ trunk/man/setup-storage.8	
-@@ -157,14 +157,18 @@
+@@ -162,14 +162,18 @@
  .br
             | preserve_always:[^/,\\s\\-]+-[^/,\\s\\-]+(,[^/,\\s\\-]+-[^/,\\s\\-]+)*
  .br
@@ -155,7 +155,7 @@
             | resize:[^/,\\s\\-]+-[^/,\\s\\-]+(,[^/,\\s\\-]+-[^/,\\s\\-]+)*
  .br
             /* attempt to resize partitions */
-@@ -183,14 +187,18 @@
+@@ -188,14 +192,18 @@
  .br
             | preserve_always:[[:digit:]]+(,[[:digit:]]+)*
  .br
@@ -176,7 +176,7 @@
             | fstabkey:(device|label|uuid)
  .br
             /* when creating the fstab the key used for defining the device
-@@ -221,6 +229,10 @@
+@@ -226,6 +234,10 @@
  .br
             first time */
  .br
@@ -187,7 +187,7 @@
             | resize:[[:digit:]]+(,[[:digit:]]+)*
  .br
             /* attempt to resize partitions */
-@@ -379,10 +391,11 @@
+@@ -384,10 +396,11 @@
  Any options to mkfs.xxx may be given using createopts="".
  .IP \(bu
  The "preserveX" and "boot" options are one of the options now given on the

Modified: branches/experimental/patches/setup-storage_ramsize
===================================================================
--- branches/experimental/patches/setup-storage_ramsize	2010-07-04 14:21:44 UTC (rev 5841)
+++ branches/experimental/patches/setup-storage_ramsize	2010-07-06 05:32:59 UTC (rev 5842)
@@ -79,7 +79,7 @@
 ===================================================================
 --- trunk.orig/man/setup-storage.8
 +++ trunk/man/setup-storage.8	
-@@ -341,19 +341,19 @@
+@@ -346,19 +346,19 @@
  .br
  
  

Modified: branches/experimental/patches/setup-storage_tmpfs
===================================================================
--- branches/experimental/patches/setup-storage_tmpfs	2010-07-04 14:21:44 UTC (rev 5841)
+++ branches/experimental/patches/setup-storage_tmpfs	2010-07-06 05:32:59 UTC (rev 5842)
@@ -222,7 +222,7 @@
 ===================================================================
 --- trunk.orig/man/setup-storage.8
 +++ trunk/man/setup-storage.8	
-@@ -137,6 +137,8 @@
+@@ -142,6 +142,8 @@
  .br
             | disk_config cryptsetup( <cryptsetupoption>)*
  .br
@@ -231,7 +231,7 @@
             | disk_config end 
  .br
             | disk_config disk[[:digit:]]+( <option>)*
-@@ -289,6 +291,10 @@
+@@ -294,6 +296,10 @@
  .br
             /* lvm vg */
  .br
@@ -242,7 +242,7 @@
  
  
  type ::= primary
-@@ -367,6 +373,14 @@
+@@ -372,6 +378,14 @@
  .br
  
  
@@ -257,7 +257,7 @@
  mount_options ::= [^[:space:]]+
  .br
  
-@@ -504,6 +518,25 @@
+@@ -509,6 +523,25 @@
  .sp
  .fi
  .PP

More information about the Fai-commit mailing list