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

Michael Tautschnig mt at alioth.debian.org
Thu Apr 14 10:41:27 UTC 2011 

Author: mt
Date: 2011-04-14 10:41:18 +0000 (Thu, 14 Apr 2011)
New Revision: 6328

Modified:
   branches/experimental/patches/ainsl_man-page-return-codes
   branches/experimental/patches/bugfix-313397
   branches/experimental/patches/bugfix-479537
   branches/experimental/patches/bugfix-498412
   branches/experimental/patches/fcopy-unchanged-uid-gid
   branches/experimental/patches/fcopy_symlinks
   branches/experimental/patches/fix-eval_cmdline
   branches/experimental/patches/ftar_rm-fix
   branches/experimental/patches/grub-in-target
   branches/experimental/patches/grub-pc
   branches/experimental/patches/logtail
   branches/experimental/patches/make-fai-nfsroot_add-keys
   branches/experimental/patches/setup-storage_better-error-msg
   branches/experimental/patches/setup-storage_cryptsetup-passphrase
   branches/experimental/patches/setup-storage_deterministic-lv-ordering
   branches/experimental/patches/setup-storage_devmapper
   branches/experimental/patches/setup-storage_disklist-LOGDIR-defaults
   branches/experimental/patches/setup-storage_exp-version
   branches/experimental/patches/setup-storage_extended-is-not-last
   branches/experimental/patches/setup-storage_gpt-bios-fix
   branches/experimental/patches/setup-storage_hardcode-63-sectors
   branches/experimental/patches/setup-storage_internals-cleanup
   branches/experimental/patches/setup-storage_lvm-raid-preserve
   branches/experimental/patches/setup-storage_man-page-fixes
   branches/experimental/patches/setup-storage_no-cylinder-boundaries
   branches/experimental/patches/setup-storage_no-decimal
   branches/experimental/patches/setup-storage_no-empty-config
   branches/experimental/patches/setup-storage_preserve-format-all
   branches/experimental/patches/setup-storage_user-100-percent
Log:
quilt whitespace changes


Modified: branches/experimental/patches/ainsl_man-page-return-codes
===================================================================
--- branches/experimental/patches/ainsl_man-page-return-codes	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/ainsl_man-page-return-codes	2011-04-14 10:41:18 UTC (rev 6328)
@@ -6,7 +6,7 @@
 Index: trunk/man/ainsl.1
 ===================================================================
 --- trunk.orig/man/ainsl.1
-+++ trunk/man/ainsl.1	
++++ trunk/man/ainsl.1
 @@ -28,6 +28,9 @@
  are used for matching, not when adding the line. Additionaly,
  the following characters are escaped in LINE: ( ) +
@@ -43,7 +43,7 @@
 Index: trunk/bin/ainsl
 ===================================================================
 --- trunk.orig/bin/ainsl
-+++ trunk/bin/ainsl	
++++ trunk/bin/ainsl
 @@ -136,5 +136,5 @@
  print "ainsl: appending to $filename: $line\n" if $verbose;
  exit 0 if $opt_n;

Modified: branches/experimental/patches/bugfix-313397
===================================================================
--- branches/experimental/patches/bugfix-313397	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/bugfix-313397	2011-04-14 10:41:18 UTC (rev 6328)
@@ -9,8 +9,8 @@
 		any packages
 Index: trunk/examples/simple/files/etc/ucf.conf/DEBIAN
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ trunk/examples/simple/files/etc/ucf.conf/DEBIAN	
+--- /dev/null
++++ trunk/examples/simple/files/etc/ucf.conf/DEBIAN
 @@ -0,0 +1,39 @@
 +#
 +# This file is a bourne shell snippet, and is sourced by the
@@ -53,8 +53,8 @@
 +# conf_force_conffnew should be set.
 Index: trunk/examples/simple/files/etc/apt/apt.conf.d/force_confdef/FAIBASE
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ trunk/examples/simple/files/etc/apt/apt.conf.d/force_confdef/FAIBASE	
+--- /dev/null
++++ trunk/examples/simple/files/etc/apt/apt.conf.d/force_confdef/FAIBASE
 @@ -0,0 +1,7 @@
 +DPkg
 +{
@@ -66,7 +66,7 @@
 Index: trunk/examples/simple/hooks/instsoft.DEBIAN
 ===================================================================
 --- trunk.orig/examples/simple/hooks/instsoft.DEBIAN
-+++ trunk/examples/simple/hooks/instsoft.DEBIAN	
++++ trunk/examples/simple/hooks/instsoft.DEBIAN
 @@ -1,3 +1,6 @@
  #! /bin/bash
  

Modified: branches/experimental/patches/bugfix-479537
===================================================================
--- branches/experimental/patches/bugfix-479537	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/bugfix-479537	2011-04-14 10:41:18 UTC (rev 6328)
@@ -7,7 +7,7 @@
 Index: trunk/debian/NEWS
 ===================================================================
 --- trunk.orig/debian/NEWS
-+++ trunk/debian/NEWS	
++++ trunk/debian/NEWS
 @@ -14,6 +14,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
@@ -21,7 +21,7 @@
 Index: trunk/bin/install_packages
 ===================================================================
 --- trunk.orig/bin/install_packages
-+++ trunk/bin/install_packages	
++++ trunk/bin/install_packages
 @@ -276,13 +276,21 @@
        # by default no classes are listed after this command so doit
        $doit = 1;

Modified: branches/experimental/patches/bugfix-498412
===================================================================
--- branches/experimental/patches/bugfix-498412	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/bugfix-498412	2011-04-14 10:41:18 UTC (rev 6328)
@@ -5,7 +5,7 @@
 Index: trunk/Makefile
 ===================================================================
 --- trunk.orig/Makefile
-+++ trunk/Makefile	
++++ trunk/Makefile
 @@ -7,7 +7,7 @@
  SHAREDIR = $(DESTDIR)/usr/share/fai
  USRSBIN_SCRIPTS = make-fai-nfsroot fai-setup fcopy ftar install_packages fai-chboot faimond fai-cd fai faireboot fai-statoverride setup-storage dhcp-edit
@@ -25,8 +25,8 @@
  	install lib/setup-storage/* $(SHAREDIR)/setup-storage
 Index: trunk/bin/fai-deps
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ trunk/bin/fai-deps	
+--- /dev/null
++++ trunk/bin/fai-deps
 @@ -0,0 +1,264 @@
 +#!/usr/bin/perl
 +
@@ -295,7 +295,7 @@
 Index: trunk/debian/control
 ===================================================================
 --- trunk.orig/debian/control
-+++ trunk/debian/control	
++++ trunk/debian/control
 @@ -13,7 +13,7 @@
  Package: fai-client
  Architecture: all
@@ -308,7 +308,7 @@
 Index: trunk/debian/fai-client.install
 ===================================================================
 --- trunk.orig/debian/fai-client.install
-+++ trunk/debian/fai-client.install	
++++ trunk/debian/fai-client.install
 @@ -19,3 +19,4 @@
  usr/sbin/ftar
  usr/sbin/install_packages

Modified: branches/experimental/patches/fcopy-unchanged-uid-gid
===================================================================
--- branches/experimental/patches/fcopy-unchanged-uid-gid	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/fcopy-unchanged-uid-gid	2011-04-14 10:41:18 UTC (rev 6328)
@@ -5,7 +5,7 @@
 Index: trunk/bin/fcopy
 ===================================================================
 --- trunk.orig/bin/fcopy
-+++ trunk/bin/fcopy	
++++ trunk/bin/fcopy
 @@ -314,6 +314,13 @@
    # get mtime,uid,gid,mode from source file
    my ($stime, at defmodes) = (stat("$sourcefile/$class"))[9,4,5,2];

Modified: branches/experimental/patches/fcopy_symlinks
===================================================================
--- branches/experimental/patches/fcopy_symlinks	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/fcopy_symlinks	2011-04-14 10:41:18 UTC (rev 6328)
@@ -7,7 +7,7 @@
 Index: trunk/bin/fcopy
 ===================================================================
 --- trunk.orig/bin/fcopy
-+++ trunk/bin/fcopy	
++++ trunk/bin/fcopy
 @@ -65,14 +65,14 @@
  # getopts:
  our ($opt_s, $opt_t, $opt_r, $opt_m, $opt_M, $opt_v, $opt_d, $opt_D, $opt_i);
@@ -156,7 +156,7 @@
 Index: trunk/man/fcopy.8
 ===================================================================
 --- trunk.orig/man/fcopy.8
-+++ trunk/man/fcopy.8	
++++ trunk/man/fcopy.8
 @@ -63,6 +63,9 @@
  .B \-h
  Show help, version and summary of options.

Modified: branches/experimental/patches/fix-eval_cmdline
===================================================================
--- branches/experimental/patches/fix-eval_cmdline	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/fix-eval_cmdline	2011-04-14 10:41:18 UTC (rev 6328)
@@ -6,7 +6,7 @@
 Index: trunk/lib/subroutines
 ===================================================================
 --- trunk.orig/lib/subroutines
-+++ trunk/lib/subroutines	
++++ trunk/lib/subroutines
 @@ -665,18 +665,22 @@
      echo -n "Kernel currently running: "
      uname -rsmo

Modified: branches/experimental/patches/ftar_rm-fix
===================================================================
--- branches/experimental/patches/ftar_rm-fix	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/ftar_rm-fix	2011-04-14 10:41:18 UTC (rev 6328)
@@ -4,7 +4,7 @@
 Index: trunk/bin/ftar
 ===================================================================
 --- trunk.orig/bin/ftar
-+++ trunk/bin/ftar	
++++ trunk/bin/ftar
 @@ -42,6 +42,18 @@
      local file=$1
      local catname=$2

Modified: branches/experimental/patches/grub-in-target
===================================================================
--- branches/experimental/patches/grub-in-target	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/grub-in-target	2011-04-14 10:41:18 UTC (rev 6328)
@@ -8,7 +8,7 @@
 Index: trunk/lib/subroutines
 ===================================================================
 --- trunk.orig/lib/subroutines
-+++ trunk/lib/subroutines	
++++ trunk/lib/subroutines
 @@ -494,6 +494,7 @@
  	die "Internal error when calling /tmp/rebootCD."
      fi
@@ -34,7 +34,7 @@
 Index: trunk/examples/simple/files/boot/grub/menu.lst/postinst
 ===================================================================
 --- trunk.orig/examples/simple/files/boot/grub/menu.lst/postinst
-+++ trunk/examples/simple/files/boot/grub/menu.lst/postinst	
++++ trunk/examples/simple/files/boot/grub/menu.lst/postinst
 @@ -17,7 +17,7 @@
  [ -z "$BOOT_DEVICE" ]    && exit 701
  [ -z "$BOOT_PARTITION" ] && exit 702

Modified: branches/experimental/patches/grub-pc
===================================================================
--- branches/experimental/patches/grub-pc	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/grub-pc	2011-04-14 10:41:18 UTC (rev 6328)
@@ -5,7 +5,7 @@
 Index: trunk/examples/simple/package_config/DEBIAN
 ===================================================================
 --- trunk.orig/examples/simple/package_config/DEBIAN
-+++ trunk/examples/simple/package_config/DEBIAN	
++++ trunk/examples/simple/package_config/DEBIAN
 @@ -17,10 +17,10 @@
  dhcp3-client
  
@@ -22,7 +22,7 @@
 Index: trunk/examples/simple/class/50-host-classes
 ===================================================================
 --- trunk.orig/examples/simple/class/50-host-classes
-+++ trunk/examples/simple/class/50-host-classes	
++++ trunk/examples/simple/class/50-host-classes
 @@ -25,5 +25,4 @@
  	echo "FAIBASE DEBIAN DHCPC" ;;
  esac
@@ -31,8 +31,8 @@
  exit 0
 Index: trunk/examples/simple/class/51-grub
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ trunk/examples/simple/class/51-grub	
+--- /dev/null
++++ trunk/examples/simple/class/51-grub
 @@ -0,0 +1,4 @@
 +#! /bin/bash
 +

Modified: branches/experimental/patches/logtail
===================================================================
--- branches/experimental/patches/logtail	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/logtail	2011-04-14 10:41:18 UTC (rev 6328)
@@ -5,7 +5,7 @@
 Index: trunk/bin/fai
 ===================================================================
 --- trunk.orig/bin/fai
-+++ trunk/bin/fai	
++++ trunk/bin/fai
 @@ -291,6 +291,9 @@
      mkdir -p $LOGDIR
      ln -snf $action-$fai_rundate $LOGDIR/../last-$action
@@ -19,7 +19,7 @@
 Index: trunk/debian/control
 ===================================================================
 --- trunk.orig/debian/control
-+++ trunk/debian/control	
++++ trunk/debian/control
 @@ -14,6 +14,7 @@
  Architecture: all
  Depends: perl, file, libapt-pkg-perl, iproute
@@ -31,7 +31,7 @@
 Index: trunk/lib/subroutines
 ===================================================================
 --- trunk.orig/lib/subroutines
-+++ trunk/lib/subroutines	
++++ trunk/lib/subroutines
 @@ -83,7 +83,11 @@
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  save_dmesg() {

Modified: branches/experimental/patches/make-fai-nfsroot_add-keys
===================================================================
--- branches/experimental/patches/make-fai-nfsroot_add-keys	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/make-fai-nfsroot_add-keys	2011-04-14 10:41:18 UTC (rev 6328)
@@ -6,7 +6,7 @@
 Index: trunk/bin/make-fai-nfsroot
 ===================================================================
 --- trunk.orig/bin/make-fai-nfsroot
-+++ trunk/bin/make-fai-nfsroot	
++++ trunk/bin/make-fai-nfsroot
 @@ -380,6 +380,17 @@
      mount -t proc   /proc  $NFSROOT/proc
      mount -t sysfs  /sys   $NFSROOT/sys
@@ -28,7 +28,7 @@
 Index: trunk/man/make-fai-nfsroot.8
 ===================================================================
 --- trunk.orig/man/make-fai-nfsroot.8
-+++ trunk/man/make-fai-nfsroot.8	
++++ trunk/man/make-fai-nfsroot.8
 @@ -165,6 +165,10 @@
  Copy this file to the NFSROOT.
  .PD 0

Modified: branches/experimental/patches/setup-storage_better-error-msg
===================================================================
--- branches/experimental/patches/setup-storage_better-error-msg	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/setup-storage_better-error-msg	2011-04-14 10:41:18 UTC (rev 6328)
@@ -13,7 +13,7 @@
 Index: trunk/lib/setup-storage/Parser.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Parser.pm
-+++ trunk/lib/setup-storage/Parser.pm	
++++ trunk/lib/setup-storage/Parser.pm
 @@ -128,7 +128,7 @@
  
    # test, whether this is the first disk_config stanza to configure $disk
@@ -95,7 +95,7 @@
 Index: trunk/lib/setup-storage/Volumes.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Volumes.pm
-+++ trunk/lib/setup-storage/Volumes.pm	
++++ trunk/lib/setup-storage/Volumes.pm
 @@ -456,7 +456,9 @@
  	  }
        }
@@ -119,7 +119,7 @@
 Index: trunk/lib/setup-storage/Init.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Init.pm
-+++ trunk/lib/setup-storage/Init.pm	
++++ trunk/lib/setup-storage/Init.pm
 @@ -302,7 +302,9 @@
  
    my ($error_msg) = @_;

Modified: branches/experimental/patches/setup-storage_cryptsetup-passphrase
===================================================================
--- branches/experimental/patches/setup-storage_cryptsetup-passphrase	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/setup-storage_cryptsetup-passphrase	2011-04-14 10:41:18 UTC (rev 6328)
@@ -8,7 +8,7 @@
 Index: trunk/lib/setup-storage/Commands.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Commands.pm
-+++ trunk/lib/setup-storage/Commands.pm	
++++ trunk/lib/setup-storage/Commands.pm
 @@ -232,7 +232,7 @@
          $pre_dep = "random_init_$real_dev";
        }
@@ -46,7 +46,7 @@
 Index: trunk/lib/setup-storage/Parser.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Parser.pm
-+++ trunk/lib/setup-storage/Parser.pm	
++++ trunk/lib/setup-storage/Parser.pm
 @@ -695,7 +695,7 @@
            $FAI::partition_pointer = (\%FAI::configs)->{RAID}->{volumes}->{$vol_id};
          }
@@ -59,7 +59,7 @@
 Index: trunk/man/setup-storage.8
 ===================================================================
 --- trunk.orig/man/setup-storage.8
-+++ trunk/man/setup-storage.8	
++++ trunk/man/setup-storage.8
 @@ -330,7 +330,11 @@
  .br
           | luks

Modified: branches/experimental/patches/setup-storage_deterministic-lv-ordering
===================================================================
--- branches/experimental/patches/setup-storage_deterministic-lv-ordering	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/setup-storage_deterministic-lv-ordering	2011-04-14 10:41:18 UTC (rev 6328)
@@ -6,7 +6,7 @@
 Index: trunk/lib/setup-storage/Parser.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Parser.pm
-+++ trunk/lib/setup-storage/Parser.pm	
++++ trunk/lib/setup-storage/Parser.pm
 @@ -807,6 +807,8 @@
            # make sure, $2 has not been defined already
            defined ($FAI::configs{$FAI::device}{volumes}{$2}{size}{range}) and 
@@ -41,7 +41,7 @@
 Index: trunk/lib/setup-storage/Commands.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Commands.pm
-+++ trunk/lib/setup-storage/Commands.pm	
++++ trunk/lib/setup-storage/Commands.pm
 @@ -523,7 +523,7 @@
    my $vg = $1; # the actual volume group
  

Modified: branches/experimental/patches/setup-storage_devmapper
===================================================================
--- branches/experimental/patches/setup-storage_devmapper	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/setup-storage_devmapper	2011-04-14 10:41:18 UTC (rev 6328)
@@ -1,7 +1,7 @@
 Index: trunk/lib/setup-storage/Init.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Init.pm
-+++ trunk/lib/setup-storage/Init.pm	
++++ trunk/lib/setup-storage/Init.pm
 @@ -195,6 +195,7 @@
      defined($2) or return (1, "/dev/$1", -1);
      return (1, "/dev/$1", $3);

Modified: branches/experimental/patches/setup-storage_disklist-LOGDIR-defaults
===================================================================
--- branches/experimental/patches/setup-storage_disklist-LOGDIR-defaults	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/setup-storage_disklist-LOGDIR-defaults	2011-04-14 10:41:18 UTC (rev 6328)
@@ -7,7 +7,7 @@
 Index: trunk/bin/setup-storage
 ===================================================================
 --- trunk.orig/bin/setup-storage
-+++ trunk/bin/setup-storage	
++++ trunk/bin/setup-storage
 @@ -70,20 +70,6 @@
         [-h]                     print this help message
  EOF
@@ -112,7 +112,7 @@
 Index: trunk/lib/setup-storage/Commands.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Commands.pm
-+++ trunk/lib/setup-storage/Commands.pm	
++++ trunk/lib/setup-storage/Commands.pm
 @@ -233,7 +233,7 @@
        }
  
@@ -125,7 +125,7 @@
 Index: trunk/lib/setup-storage/Init.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Init.pm
-+++ trunk/lib/setup-storage/Init.pm	
++++ trunk/lib/setup-storage/Init.pm
 @@ -45,7 +45,22 @@
  #
  ################################################################################
@@ -153,7 +153,7 @@
 Index: trunk/man/setup-storage.8
 ===================================================================
 --- trunk.orig/man/setup-storage.8
-+++ trunk/man/setup-storage.8	
++++ trunk/man/setup-storage.8
 @@ -69,9 +69,9 @@
  .B disklist
  The

Modified: branches/experimental/patches/setup-storage_exp-version
===================================================================
--- branches/experimental/patches/setup-storage_exp-version	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/setup-storage_exp-version	2011-04-14 10:41:18 UTC (rev 6328)
@@ -4,7 +4,7 @@
 Index: trunk/bin/setup-storage
 ===================================================================
 --- trunk.orig/bin/setup-storage
-+++ trunk/bin/setup-storage	
++++ trunk/bin/setup-storage
 @@ -53,7 +53,7 @@
  
  package FAI;

Modified: branches/experimental/patches/setup-storage_extended-is-not-last
===================================================================
--- branches/experimental/patches/setup-storage_extended-is-not-last	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/setup-storage_extended-is-not-last	2011-04-14 10:41:18 UTC (rev 6328)
@@ -5,7 +5,7 @@
 Index: trunk/lib/setup-storage/Sizes.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Sizes.pm
-+++ trunk/lib/setup-storage/Sizes.pm	
++++ trunk/lib/setup-storage/Sizes.pm
 @@ -361,15 +361,9 @@
      ($part->{size}->{extended} == $curr_part->{is_extended})
        or die "Preserved partition $part_dev_name can't change extended/normal setting\n";

Modified: branches/experimental/patches/setup-storage_gpt-bios-fix
===================================================================
--- branches/experimental/patches/setup-storage_gpt-bios-fix	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/setup-storage_gpt-bios-fix	2011-04-14 10:41:18 UTC (rev 6328)
@@ -5,7 +5,7 @@
 Index: trunk/lib/setup-storage/Sizes.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Sizes.pm
-+++ trunk/lib/setup-storage/Sizes.pm	
++++ trunk/lib/setup-storage/Sizes.pm
 @@ -675,13 +675,20 @@
        $min_req_total_space += 33 * $current_disk->{sector_size};
  

Modified: branches/experimental/patches/setup-storage_hardcode-63-sectors
===================================================================
--- branches/experimental/patches/setup-storage_hardcode-63-sectors	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/setup-storage_hardcode-63-sectors	2011-04-14 10:41:18 UTC (rev 6328)
@@ -6,7 +6,7 @@
 Index: trunk/lib/setup-storage/Sizes.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Sizes.pm
-+++ trunk/lib/setup-storage/Sizes.pm	
++++ trunk/lib/setup-storage/Sizes.pm
 @@ -641,15 +641,11 @@
      my $next_start = 0;
  

Modified: branches/experimental/patches/setup-storage_internals-cleanup
===================================================================
--- branches/experimental/patches/setup-storage_internals-cleanup	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/setup-storage_internals-cleanup	2011-04-14 10:41:18 UTC (rev 6328)
@@ -7,7 +7,7 @@
 Index: trunk/lib/setup-storage/Fstab.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Fstab.pm
-+++ trunk/lib/setup-storage/Fstab.pm	
++++ trunk/lib/setup-storage/Fstab.pm
 @@ -224,8 +224,8 @@
          # skip extended partitions and entries without a mountpoint
          next if ($p_ref->{size}->{extended} || $p_ref->{mountpoint} eq "-");
@@ -22,7 +22,7 @@
 Index: trunk/lib/setup-storage/Parser.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Parser.pm
-+++ trunk/lib/setup-storage/Parser.pm	
++++ trunk/lib/setup-storage/Parser.pm
 @@ -275,10 +275,6 @@
            size => {}
          };
@@ -48,7 +48,7 @@
 Index: trunk/lib/setup-storage/Sizes.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Sizes.pm
-+++ trunk/lib/setup-storage/Sizes.pm	
++++ trunk/lib/setup-storage/Sizes.pm
 @@ -295,15 +295,14 @@
  # @param $config Disk config
  # @param $current_disk Current config of this disk
@@ -252,7 +252,7 @@
 Index: trunk/lib/setup-storage/Volumes.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Volumes.pm
-+++ trunk/lib/setup-storage/Volumes.pm	
++++ trunk/lib/setup-storage/Volumes.pm
 @@ -578,10 +578,10 @@
            defined ($FAI::current_config{$1}) or die
              "Can't preserve partition on $1 because $1 does not exist\n";

Modified: branches/experimental/patches/setup-storage_lvm-raid-preserve
===================================================================
--- branches/experimental/patches/setup-storage_lvm-raid-preserve	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/setup-storage_lvm-raid-preserve	2011-04-14 10:41:18 UTC (rev 6328)
@@ -16,7 +16,7 @@
 Index: trunk/lib/setup-storage/Volumes.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Volumes.pm
-+++ trunk/lib/setup-storage/Volumes.pm	
++++ trunk/lib/setup-storage/Volumes.pm
 @@ -98,6 +98,9 @@
      # make sure, $disk is a proper block device
      (-b $disk) or die "$disk is not a block special device!\n";
@@ -202,7 +202,7 @@
 Index: trunk/lib/setup-storage/Commands.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Commands.pm
-+++ trunk/lib/setup-storage/Commands.pm	
++++ trunk/lib/setup-storage/Commands.pm
 @@ -290,6 +290,19 @@
  ################################################################################
  sub build_raid_commands {
@@ -414,7 +414,7 @@
 Index: trunk/bin/setup-storage
 ===================================================================
 --- trunk.orig/bin/setup-storage
-+++ trunk/bin/setup-storage	
++++ trunk/bin/setup-storage
 @@ -137,6 +137,15 @@
  # make sure there are no empty disk_config stanzas
  &FAI::check_config;
@@ -466,7 +466,7 @@
 Index: trunk/lib/setup-storage/Init.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Init.pm
-+++ trunk/lib/setup-storage/Init.pm	
++++ trunk/lib/setup-storage/Init.pm
 @@ -160,6 +160,14 @@
  
  ################################################################################
@@ -485,7 +485,7 @@
 Index: trunk/lib/setup-storage/Parser.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Parser.pm
-+++ trunk/lib/setup-storage/Parser.pm	
++++ trunk/lib/setup-storage/Parser.pm
 @@ -140,6 +140,11 @@
      partitions => {},
      opts_all   => {}
@@ -674,7 +674,7 @@
 Index: trunk/lib/setup-storage/Exec.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Exec.pm
-+++ trunk/lib/setup-storage/Exec.pm	
++++ trunk/lib/setup-storage/Exec.pm
 @@ -178,6 +178,15 @@
      exit_codes   => [0..255],
    },

Modified: branches/experimental/patches/setup-storage_man-page-fixes
===================================================================
--- branches/experimental/patches/setup-storage_man-page-fixes	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/setup-storage_man-page-fixes	2011-04-14 10:41:18 UTC (rev 6328)
@@ -5,7 +5,7 @@
 Index: trunk/man/setup-storage.8
 ===================================================================
 --- trunk.orig/man/setup-storage.8
-+++ trunk/man/setup-storage.8	
++++ trunk/man/setup-storage.8
 @@ -14,11 +14,11 @@
  \fBsetup-storage\fP
  computes effective partition and volume sizes and executes the necessary

Modified: branches/experimental/patches/setup-storage_no-cylinder-boundaries
===================================================================
--- branches/experimental/patches/setup-storage_no-cylinder-boundaries	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/setup-storage_no-cylinder-boundaries	2011-04-14 10:41:18 UTC (rev 6328)
@@ -19,7 +19,7 @@
 Index: trunk/lib/setup-storage/Sizes.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Sizes.pm
-+++ trunk/lib/setup-storage/Sizes.pm	
++++ trunk/lib/setup-storage/Sizes.pm
 @@ -353,9 +353,8 @@
            $current_disk->{bios_heads})) or 
        warn "Preserved partition $part_dev_name does not end at a cylinder boundary, parted may fail to restore the partition!\n";
@@ -248,7 +248,7 @@
 Index: trunk/lib/setup-storage/Parser.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Parser.pm
-+++ trunk/lib/setup-storage/Parser.pm	
++++ trunk/lib/setup-storage/Parser.pm
 @@ -590,6 +590,10 @@
          {
            $FAI::configs{$FAI::device}{partitions}{$_}{size}{always_format} = 1 foreach (split(",", $1));
@@ -290,7 +290,7 @@
 Index: trunk/man/setup-storage.8
 ===================================================================
 --- trunk.orig/man/setup-storage.8
-+++ trunk/man/setup-storage.8	
++++ trunk/man/setup-storage.8
 @@ -284,6 +284,20 @@
  .br
             */

Modified: branches/experimental/patches/setup-storage_no-decimal
===================================================================
--- branches/experimental/patches/setup-storage_no-decimal	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/setup-storage_no-decimal	2011-04-14 10:41:18 UTC (rev 6328)
@@ -5,7 +5,7 @@
 Index: trunk/man/setup-storage.8
 ===================================================================
 --- trunk.orig/man/setup-storage.8
-+++ trunk/man/setup-storage.8	
++++ trunk/man/setup-storage.8
 @@ -378,9 +378,11 @@
  .br
           /* size in kilo (KiB), mega (default, MiB), giga (GiB), tera (TiB),

Modified: branches/experimental/patches/setup-storage_no-empty-config
===================================================================
--- branches/experimental/patches/setup-storage_no-empty-config	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/setup-storage_no-empty-config	2011-04-14 10:41:18 UTC (rev 6328)
@@ -5,7 +5,7 @@
 Index: trunk/bin/setup-storage
 ===================================================================
 --- trunk.orig/bin/setup-storage
-+++ trunk/bin/setup-storage	
++++ trunk/bin/setup-storage
 @@ -127,6 +127,9 @@
  print "Using config file: $opt_f\n";
  &FAI::run_parser($config_file);
@@ -19,7 +19,7 @@
 Index: trunk/lib/setup-storage/Parser.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Parser.pm
-+++ trunk/lib/setup-storage/Parser.pm	
++++ trunk/lib/setup-storage/Parser.pm
 @@ -1061,5 +1061,33 @@
    defined $FAI::Parser->file($input) or die "Syntax error\n";
  }

Modified: branches/experimental/patches/setup-storage_preserve-format-all
===================================================================
--- branches/experimental/patches/setup-storage_preserve-format-all	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/setup-storage_preserve-format-all	2011-04-14 10:41:18 UTC (rev 6328)
@@ -12,7 +12,7 @@
 Index: trunk/lib/setup-storage/Parser.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Parser.pm
-+++ trunk/lib/setup-storage/Parser.pm	
++++ trunk/lib/setup-storage/Parser.pm
 @@ -137,7 +137,8 @@
      bootable   => -1,
      fstabkey   => "device",
@@ -357,7 +357,7 @@
 Index: trunk/man/setup-storage.8
 ===================================================================
 --- trunk.orig/man/setup-storage.8
-+++ trunk/man/setup-storage.8	
++++ trunk/man/setup-storage.8
 @@ -158,25 +158,25 @@
  
  lvmoption ::= /* empty */
@@ -449,7 +449,7 @@
 Index: trunk/lib/setup-storage/Commands.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Commands.pm
-+++ trunk/lib/setup-storage/Commands.pm	
++++ trunk/lib/setup-storage/Commands.pm
 @@ -1121,6 +1121,16 @@
      } elsif (defined($FAI::configs{$config}{partitions}{0})) {
        # no partition table operations
@@ -470,7 +470,7 @@
 Index: trunk/lib/setup-storage/Sizes.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Sizes.pm
-+++ trunk/lib/setup-storage/Sizes.pm	
++++ trunk/lib/setup-storage/Sizes.pm
 @@ -318,7 +318,8 @@
    my $curr_part = $current_disk->{partitions}->{$part_id};
  

Modified: branches/experimental/patches/setup-storage_user-100-percent
===================================================================
--- branches/experimental/patches/setup-storage_user-100-percent	2011-04-13 10:46:34 UTC (rev 6327)
+++ branches/experimental/patches/setup-storage_user-100-percent	2011-04-14 10:41:18 UTC (rev 6328)
@@ -6,7 +6,7 @@
 Index: trunk/lib/setup-storage/Sizes.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Sizes.pm
-+++ trunk/lib/setup-storage/Sizes.pm	
++++ trunk/lib/setup-storage/Sizes.pm
 @@ -296,13 +296,14 @@
  # @param $current_disk Current config of this disk
  # @param $next_start Start of the next partition

More information about the Fai-commit mailing list