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

Michael Tautschnig mt at alioth.debian.org
Fri Jul 23 09:08:44 UTC 2010


Author: mt
Date: 2010-07-23 09:08:31 +0000 (Fri, 23 Jul 2010)
New Revision: 5865

Added:
   branches/experimental/patches/dhcp-transition
Modified:
   branches/experimental/patches/grub-pc
   branches/experimental/patches/series
   branches/experimental/patches/setup-storage_abs-path
   branches/experimental/patches/setup-storage_always-format
   branches/experimental/patches/setup-storage_better-parser-errors
   branches/experimental/patches/setup-storage_cciss-bugfix
   branches/experimental/patches/setup-storage_devmapper
   branches/experimental/patches/setup-storage_empty-vg
   branches/experimental/patches/setup-storage_exit-codes
   branches/experimental/patches/setup-storage_exp-version
   branches/experimental/patches/setup-storage_extended-is-not-last
   branches/experimental/patches/setup-storage_external-journal
   branches/experimental/patches/setup-storage_lvm-preserve2
   branches/experimental/patches/setup-storage_no-cylinder-boundaries
   branches/experimental/patches/setup-storage_no-useless-rebuild
   branches/experimental/patches/setup-storage_parted2.2
   branches/experimental/patches/setup-storage_preserve-lazy
   branches/experimental/patches/setup-storage_ramsize
   branches/experimental/patches/setup-storage_resize2fs
   branches/experimental/patches/setup-storage_tmpfs
   branches/experimental/patches/setup-storage_used-devs-only
Log:
- updated patches to current trunk
- added patch for dhcp3->dhcp4 transition such that FAI works on both lenny and
  squeeze.


Added: branches/experimental/patches/dhcp-transition
===================================================================
--- branches/experimental/patches/dhcp-transition	                        (rev 0)
+++ branches/experimental/patches/dhcp-transition	2010-07-23 09:08:31 UTC (rev 5865)
@@ -0,0 +1,175 @@
+2010-07-23  Michael Tautschnig  <mt at debian.org>
+
+	* Patch is incomplete! Simple example has not been updated, should be done in
+		trunk directly.
+	* Makefile, fai-nfsroot.dirs, fai-nfsroot.install, get-boot-info: Install
+		dhclient-fai.conf and dhclient-fai-script into /usr/share/fai instead of
+		/etc/dhcp3 (closes: #585063).
+	* dhcp-edit, control: Updated to work with isc-dhcp-server or dhcp3-server,
+		whichever is available.
+	* fai-guide.txt: Updated to isch-dhcp-server.
+
+Index: trunk/Makefile
+===================================================================
+--- trunk.orig/Makefile
++++ trunk/Makefile	
+@@ -23,7 +23,7 @@
+ 	$(MAKE) -f debian/rules clean
+ 
+ install: 
+-	mkdir -p $(DESTDIR)/{sbin,man} $(DESTDIR)/etc/{modutils,dhcp3,apt/apt.conf.d}
++	mkdir -p $(DESTDIR)/{sbin,man} $(DESTDIR)/etc/{modutils,apt/apt.conf.d}
+ 	mkdir -p $(DESTDIR)/usr/{sbin,bin} $(DESTDIR)/usr/lib/fai $(DESTDIR)/etc/fai/apt
+ 	mkdir -p $(DESTDIR)/etc/{init,init.d} $(DESTDIR)/usr/share/fai/{pixmaps,setup-storage}
+ 	install man/* $(DESTDIR)/man
+@@ -34,8 +34,8 @@
+ 	cd bin ; install $(USRSBIN_SCRIPTS) $(DESTDIR)/usr/sbin
+ 	cd bin ; install $(USRBIN_SCRIPTS) $(DESTDIR)/usr/bin
+ 	install bin/fai-start-stop-daemon $(DESTDIR)/sbin
+-	install bin/dhclient-fai-script  $(DESTDIR)/etc/dhcp3
+-	install -m644 conf/dhclient-fai.conf $(DESTDIR)/etc/dhcp3
++	install bin/dhclient-fai-script  $(DESTDIR)/usr/share/fai
++	install -m644 conf/dhclient-fai.conf $(DESTDIR)/usr/share/fai
+ 	install -m644 conf/apt.conf $(DESTDIR)/etc/apt/apt.conf.d/90fai
+ 	install -m644 conf/fai.conf conf/menu.lst conf/live.conf $(DESTDIR)/etc/fai/
+ 	install -m644 conf/make-fai-nfsroot.conf $(DESTDIR)/etc/fai/
+Index: trunk/bin/dhcp-edit
+===================================================================
+--- trunk.orig/bin/dhcp-edit
++++ trunk/bin/dhcp-edit	
+@@ -20,7 +20,7 @@
+ # -q quiet: do not print error if host/mac entry not found, exit code 0
+ 
+ $version="Version 1.2, 6-july-2010";
+-$dhcpdconf="/etc/dhcp3/dhcpd.conf";
++$dhcpdconf=(-d "/etc/dhcp" ? "/etc/dhcp/dhcpd.conf" : "/etc/dhcp3/dhcpd.conf");
+ 
+ $modified=0; # 1 if dhcpd.conf was modified
+ our ($opt_p,$opt_d,$opt_h,$opt_n,$opt_r);
+@@ -150,7 +150,8 @@
+     return;
+   }
+ 
+-  print qx#/etc/init.d/dhcp3-server restart#
++  print (-x "/etc/init.d/isc-dhcp-server" ? qx#/etc/init.d/isc-dhcp-server# :
++    qx#/etc/init.d/dhcp3-server restart#)
+ }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ 
+Index: trunk/debian/control
+===================================================================
+--- trunk.orig/debian/control
++++ trunk/debian/control	
+@@ -42,7 +42,7 @@
+ Package: fai-server
+ Architecture: all
+ Depends: fai-client, debootstrap
+-Recommends: nfs-kernel-server, dhcp3-server, tftpd-hpa | tftpd, openssh-server, openssh-client, syslinux-common, openbsd-inetd | inet-superserver, fai-setup-storage
++Recommends: nfs-kernel-server, isc-dhcp-server | dhcp3-server, tftpd-hpa | tftpd, openssh-server, openssh-client, syslinux-common, openbsd-inetd | inet-superserver, fai-setup-storage
+ Suggests: debmirror, reprepro, genisoimage, grub, aptitude, perl-tk, libproc-daemon-perl
+ Conflicts: fai
+ Replaces: fai
+@@ -63,7 +63,7 @@
+ 
+ Package: fai-quickstart
+ Architecture: all
+-Depends: fai-server, fai-doc, dhcp3-server, nfs-kernel-server, syslinux-common, tftpd-hpa, reprepro, genisoimage, openbsd-inetd | inet-superserver
++Depends: fai-server, fai-doc, isc-dhcp-server | dhcp3-server, nfs-kernel-server, syslinux-common, tftpd-hpa, reprepro, genisoimage, openbsd-inetd | inet-superserver
+ Description: Fully Automatic Installation quickstart package
+  FAI is a non-interactive system to install, customize and manage
+  Linux systems and software configurations on computers as well as
+Index: trunk/debian/fai-nfsroot.dirs
+===================================================================
+--- trunk.orig/debian/fai-nfsroot.dirs
++++ trunk/debian/fai-nfsroot.dirs	
+@@ -1,6 +1,6 @@
+ etc/fai
+ etc/init
+-etc/dhcp3
+ etc/init.d
+ etc/apt/apt.conf.d
+ usr/lib/fai
++usr/share/fai
+Index: trunk/debian/fai-nfsroot.install
+===================================================================
+--- trunk.orig/debian/fai-nfsroot.install
++++ trunk/debian/fai-nfsroot.install	
+@@ -6,8 +6,8 @@
+ usr/lib/fai/fai-mount-disk
+ usr/lib/fai/mount2dir
+ usr/lib/fai/task_sysinfo
+-etc/dhcp3/dhclient-fai-script
+-etc/dhcp3/dhclient-fai.conf
++usr/share/fai/dhclient-fai-script
++usr/share/fai/dhclient-fai.conf
+ etc/apt/apt.conf.d/90fai
+ etc/init.d/fai-abort
+ etc/init/fai.conf
+Index: trunk/doc/fai-guide.txt
+===================================================================
+--- trunk.orig/doc/fai-guide.txt
++++ trunk/doc/fai-guide.txt	
+@@ -403,7 +403,7 @@
+ Reading task descriptions... Done  
+ 
+ The following NEW packages will be installed:
+-  apt-move{a} dhcp3-server{a} fai-doc{a} fai-quickstart fai-server{a}
++  apt-move{a} isc-dhcp-server{a} fai-doc{a} fai-quickstart fai-server{a}
+   genisoimage{a} inetutils-inetd{a} nfs-kernel-server{a} 
+   openssh-server{a} syslinux-common{a} tftpd-hpa{a} 
+ 0 packages upgraded, 11 newly installed, 0 to remove and 0 not upgraded.
+@@ -610,12 +610,12 @@
+ First, install following additional needed packages:
+ 
+ ----
+-faiserver# apt-get install dhcp3-server syslinux-common tftpd-hpa
++faiserver# apt-get install isc-dhcp-server syslinux-common tftpd-hpa
+ ----
+ 
+ Then set up the DHCP daemon. A sample configuration file can be found
+ in '/usr/share/doc/fai-doc/examples/etc/dhcpd.conf'. Copy this file to
+-'/etc/dhcp3/dhcpd.conf'.
++'/etc/dhcp/dhcpd.conf'.
+ 
+ The install client then loads the pxelinux boot loader which receives
+ its configuration via TFTP from a file in the directory
+@@ -712,7 +712,7 @@
+ If you make any changes to the DHCP daemon configuration, you must
+ restart the daemon.
+ 
+-  # /etc/init.d/dhcp3-server restart
++  # /etc/init.d/isc-dhcp-server restart
+ 
+ By default, the DHCP daemon writes its log files to
+ '/var/log/daemon.log'. The command `fai-chboot(8)` is used for
+@@ -2162,7 +2162,7 @@
+ Add the following packages to the install server:
+ 
+ ----
+-nucleus:/# apt-get install ntp tftpd-hpa dhcp3-server \
++nucleus:/# apt-get install ntp tftpd-hpa isc-dhcp-server \
+   nfs-kernel-server etherwake fai
+ nucleus:/# tasksel -q -n install dns-server
+ nucleus:/# apt-get dselect-upgrade
+@@ -2173,7 +2173,7 @@
+ 
+ It's very important to use the internal network name +atom00+ for the
+ master server (not the external name +nucleus+) in
+-'/etc/dhcp3/dhcpd.conf' and 'make-fai-nfsroot.conf'. Replace the
++'/etc/dhcp/dhcpd.conf' and 'make-fai-nfsroot.conf'. Replace the
+ strings FAISERVER with _atom00_ and uncomment the following line in
+ 'make-fai-nfsroot.conf' so the Beowulf nodes can use the name for
+ connecting to their master server.
+Index: trunk/lib/get-boot-info
+===================================================================
+--- trunk.orig/lib/get-boot-info
++++ trunk/lib/get-boot-info	
+@@ -62,7 +62,7 @@
+ get_dhcp_info() {
+ 
+     boot=1
+-    dhclient -lf /dev/null -cf /etc/dhcp3/dhclient-fai.conf -sf /etc/dhcp3/dhclient-fai-script $netdevices >>$bootlog 2> $LOGDIR/dhclient.log
++    dhclient -lf /dev/null -cf /usr/share/fai/dhclient-fai.conf -sf /usr/share/fai/dhclient-fai-script $netdevices >>$bootlog 2> $LOGDIR/dhclient.log
+     killall dhclient
+ }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Modified: branches/experimental/patches/grub-pc
===================================================================
--- branches/experimental/patches/grub-pc	2010-07-16 14:31:56 UTC (rev 5864)
+++ branches/experimental/patches/grub-pc	2010-07-23 09:08:31 UTC (rev 5865)
@@ -93,7 +93,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Fstab.pm
 +++ trunk/lib/setup-storage/Fstab.pm	
-@@ -127,6 +127,54 @@
+@@ -128,6 +128,54 @@
    }
  }
  
@@ -148,7 +148,7 @@
  
  ################################################################################
  #
-@@ -147,6 +195,9 @@
+@@ -148,6 +196,9 @@
    # the file to be returned, a list of lines
    my @fstab = ();
  
@@ -158,7 +158,7 @@
    # walk through all configured parts
    # the order of entries is most likely wrong, it is fixed at the end
    foreach my $c (keys %$config) {
-@@ -170,15 +221,11 @@
+@@ -171,15 +222,11 @@
  
          my $device_name = &FAI::make_device_name($device, $p_ref->{number});
  
@@ -178,7 +178,7 @@
          }
  
          push @fstab, &FAI::create_fstab_line($p_ref,
-@@ -215,15 +262,13 @@
+@@ -216,15 +263,13 @@
  
          my $device_name = $fstab_key[0];
  
@@ -201,7 +201,7 @@
          }
  
          push @fstab, &FAI::create_fstab_line($l_ref,
-@@ -242,15 +287,13 @@
+@@ -243,15 +288,13 @@
  
          my $device_name = "/dev/md$r";
  
@@ -224,7 +224,7 @@
          }
  
          push @fstab, &FAI::create_fstab_line($r_ref,
-@@ -264,8 +307,7 @@
+@@ -265,8 +308,7 @@
  
          my $device_name = &FAI::enc_name($c_ref->{device});
  
@@ -234,7 +234,7 @@
            die "Boot partition cannot be encrypted\n";
  
          push @fstab, &FAI::create_fstab_line($c_ref, $device_name, $device_name);
-@@ -280,7 +322,10 @@
+@@ -281,7 +323,10 @@
    $FAI::disk_var{SWAPLIST} =~ s/\s*$/"/;
  
    # cleanup the list of boot devices (remove leading space and add quotes)

Modified: branches/experimental/patches/series
===================================================================
--- branches/experimental/patches/series	2010-07-16 14:31:56 UTC (rev 5864)
+++ branches/experimental/patches/series	2010-07-23 09:08:31 UTC (rev 5865)
@@ -26,3 +26,4 @@
 setup-storage_exit-codes
 setup-storage_no-useless-rebuild
 device2grub_stable_names
+dhcp-transition

Modified: branches/experimental/patches/setup-storage_abs-path
===================================================================
--- branches/experimental/patches/setup-storage_abs-path	2010-07-16 14:31:56 UTC (rev 5864)
+++ branches/experimental/patches/setup-storage_abs-path	2010-07-23 09:08:31 UTC (rev 5865)
@@ -6,7 +6,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Volumes.pm
 +++ trunk/lib/setup-storage/Volumes.pm	
-@@ -367,6 +367,7 @@
+@@ -368,6 +368,7 @@
  sub get_current_lvm {
  
    use Linux::LVM;
@@ -14,7 +14,7 @@
  
    # get the existing volume groups
    foreach my $vg (get_volume_group_list()) {
-@@ -394,8 +395,8 @@
+@@ -395,8 +396,8 @@
  
      # store the physical volumes
      my %pv_info = get_physical_volume_information($vg);
@@ -25,7 +25,7 @@
    }
  
  }
-@@ -408,6 +409,8 @@
+@@ -409,6 +410,8 @@
  ################################################################################
  sub get_current_raid {
  
@@ -34,7 +34,7 @@
    # the list to hold the output of mdadm commands as parsed below
    my @mdadm_print = ();
  
-@@ -442,7 +445,8 @@
+@@ -443,7 +446,8 @@
        $FAI::current_raid_config{$id}{mode} = $2;
      } elsif ($line =~ /^\s*devices=(\S+)$/) {
        defined($id) or &FAI::internal_error("mdadm ARRAY line not yet seen");

Modified: branches/experimental/patches/setup-storage_always-format
===================================================================
--- branches/experimental/patches/setup-storage_always-format	2010-07-16 14:31:56 UTC (rev 5864)
+++ branches/experimental/patches/setup-storage_always-format	2010-07-23 09:08:31 UTC (rev 5865)
@@ -7,7 +7,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Commands.pm
 +++ trunk/lib/setup-storage/Commands.pm	
-@@ -250,6 +250,10 @@
+@@ -251,6 +251,10 @@
        # done; its existance has been checked in propagate_and_check_preserve
        if ($vol->{preserve}) {
          &FAI::push_command("true", "", "exist_/dev/md$id");
@@ -18,7 +18,7 @@
          next;
        }
  
-@@ -438,6 +442,10 @@
+@@ -439,6 +443,10 @@
        defined ($FAI::current_lvm_config{$vg}{volumes}{$lv})
          or die "Preserved volume $vg/$lv does not exist\n";
        warn "$vg/$lv will be preserved\n";
@@ -29,7 +29,7 @@
        next;
      }
  
-@@ -481,6 +489,10 @@
+@@ -482,6 +490,10 @@
          }
        }
  
@@ -40,7 +40,7 @@
        next;
      }
  
-@@ -1038,8 +1050,9 @@
+@@ -1039,8 +1051,9 @@
        my $part = (\%FAI::configs)->{$config}->{partitions}->{$part_id};
  
        # skip preserved/resized/extended partitions
@@ -56,7 +56,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Parser.pm
 +++ trunk/lib/setup-storage/Parser.pm	
-@@ -256,6 +256,10 @@
+@@ -257,6 +257,10 @@
        defined ($part_size->{preserve})
          or $part_size->{preserve} = 0;
  
@@ -67,7 +67,7 @@
        # add the resize = 0 flag, if it doesn't exist already
        defined ($part_size->{resize}) or $part_size->{resize} = 0;
      }
-@@ -283,6 +287,10 @@
+@@ -284,6 +288,10 @@
    defined ($FAI::partition_pointer->{size}->{preserve})
      or $FAI::partition_pointer->{size}->{preserve} = 0;
  
@@ -78,7 +78,7 @@
    # add the resize = 0 flag, if it doesn't exist already
    defined ($FAI::partition_pointer->{size}->{resize})
      or $FAI::partition_pointer->{size}->{resize} = 0;
-@@ -413,6 +421,10 @@
+@@ -414,6 +422,10 @@
            # the information preferred for fstab device identifieres
            $FAI::configs{$FAI::device}{fstabkey} = $1;
          }
@@ -89,7 +89,7 @@
  
      cryptsetup_option: /^randinit/
          {
-@@ -461,6 +473,14 @@
+@@ -462,6 +474,14 @@
            # the information preferred for fstab device identifieres
            $FAI::configs{"VG_--ANY--"}{fstabkey} = $1;
          }
@@ -104,7 +104,7 @@
  
  
      option: /^preserve_always:(\d+(,\d+)*)/
-@@ -531,6 +551,10 @@
+@@ -532,6 +552,10 @@
  
  	  $FAI::configs{$FAI::device} = dclone($FAI::configs{"PHY_" . $ref_dev});
  	}
@@ -115,7 +115,7 @@
  
      volume: /^vg\s+/ name devices vgcreateopt(s?)
          | /^raid([0156]|10)\s+/
-@@ -605,6 +629,8 @@
+@@ -606,6 +630,8 @@
            # initialise the preserve and resize flags
            defined($FAI::configs{$FAI::device}{volumes}{$2}{size}{preserve}) or
              $FAI::configs{$FAI::device}{volumes}{$2}{size}{preserve} = 0;

Modified: branches/experimental/patches/setup-storage_better-parser-errors
===================================================================
--- branches/experimental/patches/setup-storage_better-parser-errors	2010-07-16 14:31:56 UTC (rev 5864)
+++ branches/experimental/patches/setup-storage_better-parser-errors	2010-07-23 09:08:31 UTC (rev 5865)
@@ -8,7 +8,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Parser.pm
 +++ trunk/lib/setup-storage/Parser.pm	
-@@ -238,7 +238,7 @@
+@@ -239,7 +239,7 @@
  
        # msdos disk labels don't allow for more than 4 primary partitions
        ($extended < 5)
@@ -17,7 +17,7 @@
  
        # initialize the entry, unless it already exists
        defined ($FAI::configs{$FAI::device}{partitions}{$extended})
-@@ -246,6 +246,10 @@
+@@ -247,6 +247,10 @@
            size => {}
          };
  
@@ -28,7 +28,7 @@
        my $part_size =
          (\%FAI::configs)->{$FAI::device}->{partitions}->{$extended}->{size};
  
-@@ -354,7 +358,6 @@
+@@ -355,7 +359,6 @@
          {
            $return = 1;
          }
@@ -36,7 +36,7 @@
  
      line: <skip: qr/[ \t]*/> "\\n"
          | <skip: qr/[ \t]*/> comment "\\n"
-@@ -420,6 +423,7 @@
+@@ -421,6 +424,7 @@
            &FAI::init_disk_config($item[ 1 ]);
          }
          option(s?)
@@ -44,7 +44,7 @@
  
      raid_option: /^preserve_always:(\d+(,\d+)*)/
          {
-@@ -643,6 +647,7 @@
+@@ -644,6 +648,7 @@
          }
          mountpoint tmpfs_size mount_options
          | type mountpoint size filesystem mount_options lv_or_fsopts
@@ -52,7 +52,7 @@
  
      type: 'primary'
          {
-@@ -714,7 +719,7 @@
+@@ -715,7 +720,7 @@
            1;
          }
  
@@ -65,7 +65,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Volumes.pm
 +++ trunk/lib/setup-storage/Volumes.pm	
-@@ -517,6 +517,8 @@
+@@ -518,6 +518,8 @@
                defined($FAI::current_config{$1}{partitions}{$part_id})) ? 1 : 0)
            if (2 == $part->{size}->{preserve});
          next unless ($part->{size}->{preserve} || $part->{size}->{resize});

Modified: branches/experimental/patches/setup-storage_cciss-bugfix
===================================================================
--- branches/experimental/patches/setup-storage_cciss-bugfix	2010-07-16 14:31:56 UTC (rev 5864)
+++ branches/experimental/patches/setup-storage_cciss-bugfix	2010-07-23 09:08:31 UTC (rev 5865)
@@ -7,7 +7,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Init.pm
 +++ trunk/lib/setup-storage/Init.pm	
-@@ -182,10 +182,10 @@
+@@ -183,10 +183,10 @@
      return (1, "/dev/$1", $2);
    }
    elsif ($dev =~

Modified: branches/experimental/patches/setup-storage_devmapper
===================================================================
--- branches/experimental/patches/setup-storage_devmapper	2010-07-16 14:31:56 UTC (rev 5864)
+++ branches/experimental/patches/setup-storage_devmapper	2010-07-23 09:08:31 UTC (rev 5865)
@@ -2,7 +2,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Init.pm
 +++ trunk/lib/setup-storage/Init.pm	
-@@ -187,6 +187,7 @@
+@@ -188,6 +188,7 @@
      defined($2) or return (1, "/dev/$1", -1);
      return (1, "/dev/$1", $2);
    }

Modified: branches/experimental/patches/setup-storage_empty-vg
===================================================================
--- branches/experimental/patches/setup-storage_empty-vg	2010-07-16 14:31:56 UTC (rev 5864)
+++ branches/experimental/patches/setup-storage_empty-vg	2010-07-23 09:08:31 UTC (rev 5865)
@@ -6,7 +6,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Volumes.pm
 +++ trunk/lib/setup-storage/Volumes.pm	
-@@ -377,7 +377,7 @@
+@@ -378,7 +378,7 @@
      my %vg_info = get_volume_group_information($vg);
      if (%vg_info) {
        $FAI::current_lvm_config{$vg}{size} = &FAI::convert_unit(

Modified: branches/experimental/patches/setup-storage_exit-codes
===================================================================
--- branches/experimental/patches/setup-storage_exit-codes	2010-07-16 14:31:56 UTC (rev 5864)
+++ branches/experimental/patches/setup-storage_exit-codes	2010-07-23 09:08:31 UTC (rev 5865)
@@ -6,7 +6,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Exec.pm
 +++ trunk/lib/setup-storage/Exec.pm	
-@@ -57,6 +57,7 @@
+@@ -58,6 +58,7 @@
      stdout_regex => "",
      program      => "parted",
      response     => "die",
@@ -14,7 +14,7 @@
    },
    {
      error   => "parted_1_new",
-@@ -65,22 +66,25 @@
+@@ -66,22 +67,25 @@
      stdout_regex => "Error: Could not stat device .* - No such file or directory",
      program      => "parted",
      response     => "die",
@@ -44,7 +44,7 @@
    },
    ## {
    ##   error        => "parted_3",
-@@ -89,6 +93,7 @@
+@@ -90,6 +94,7 @@
    ##   stdout_regex => "",
    ##   program      => "parted",
    ##   response     => \&FAI::restore_partition_table,
@@ -52,7 +52,7 @@
    ## },
    {
      error        => "parted_4",
-@@ -97,6 +102,7 @@
+@@ -98,6 +103,7 @@
      stdout_regex => "",
      program      => "parted",
      response     => "die",
@@ -60,7 +60,7 @@
    },
    {
      error        => "parted_4_new",
-@@ -105,6 +111,7 @@
+@@ -106,6 +112,7 @@
      stdout_regex => "No Implementation: Partition \\d+ isn't aligned to cylinder boundaries",
      program      => "parted",
      response     => "die",
@@ -68,7 +68,7 @@
    },
    {
      error        => "parted_5",
-@@ -113,6 +120,7 @@
+@@ -114,6 +121,7 @@
      stdout_regex => "",
      program      => "parted",
      response     => "die",
@@ -76,7 +76,7 @@
    },
    {
      error        => "parted_5_new",
-@@ -121,6 +129,7 @@
+@@ -122,6 +130,7 @@
      stdout_regex => "Error: Can't have overlapping partitions",
      program      => "parted",
      response     => "die",
@@ -84,7 +84,7 @@
    },
    {
      error        => "parted_6",
-@@ -129,6 +138,7 @@
+@@ -130,6 +139,7 @@
      stdout_regex => "",
      program      => "parted",
      response     => "die",
@@ -92,7 +92,7 @@
    },
    {
      error        => "parted_6_new",
-@@ -137,6 +147,7 @@
+@@ -138,6 +148,7 @@
      stdout_regex => "Error: Unable to satisfy all constraints on the partition",
      program      => "parted",
      response     => "die",
@@ -100,7 +100,7 @@
    },
    {
      error   => "cmd_parted_1",
-@@ -144,7 +155,8 @@
+@@ -145,7 +156,8 @@
      stderr_regex => "(parted: command not found|/sbin/parted: No such file or directory)",
      stdout_regex => "",
      program      => "parted",
@@ -110,7 +110,7 @@
    },
    {
      error => "mkfs.xfs_1",
-@@ -153,6 +165,7 @@
+@@ -154,6 +166,7 @@
      stdout_regex => "",
      program      => "mkfs.xfs",
      response     => "die",
@@ -118,7 +118,7 @@
    },
    {
      error        => "ntfsresize_1",
-@@ -161,6 +174,16 @@
+@@ -162,6 +175,16 @@
      stdout_regex => "",
      program      => "ntfsresize",
      response     => "die",
@@ -135,7 +135,7 @@
    },
  ];
  
-@@ -300,6 +323,7 @@
+@@ -301,6 +324,7 @@
    my @stdout      = ();
    my $stderr_line = "";
    my $stdout_line = "";
@@ -143,7 +143,7 @@
  
    #make tempfile, get perl filehandle and filename of the file
    my ($stderr_fh, $stderr_filename) = File::Temp::tempfile(UNLINK => 1);
-@@ -314,9 +338,10 @@
+@@ -315,9 +339,10 @@
      # execute the bash command, write stderr and stdout into the testfiles
      print "Executing: $command\n";
      `$command 1> $stdout_filename 2> $stderr_filename`;
@@ -156,7 +156,7 @@
    }
  
    # read the tempfile into lists, each element of the list one line
-@@ -344,11 +369,11 @@
+@@ -345,11 +370,11 @@
  
    #get the error, if there was any
    foreach my $err (@$FAI::error_codes) {

Modified: branches/experimental/patches/setup-storage_exp-version
===================================================================
--- branches/experimental/patches/setup-storage_exp-version	2010-07-16 14:31:56 UTC (rev 5864)
+++ branches/experimental/patches/setup-storage_exp-version	2010-07-23 09:08:31 UTC (rev 5865)
@@ -5,7 +5,7 @@
 ===================================================================
 --- trunk.orig/bin/setup-storage
 +++ trunk/bin/setup-storage	
-@@ -52,7 +52,7 @@
+@@ -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	2010-07-16 14:31:56 UTC (rev 5864)
+++ branches/experimental/patches/setup-storage_extended-is-not-last	2010-07-23 09:08:31 UTC (rev 5865)
@@ -6,7 +6,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Sizes.pm
 +++ trunk/lib/setup-storage/Sizes.pm	
-@@ -361,15 +361,9 @@
+@@ -362,15 +362,9 @@
      ($part->{size}->{extended} == $curr_part->{is_extended})
        or die "Preserved partition $part_dev_name can't change extended/normal setting\n";
  
@@ -25,7 +25,7 @@
    }
  
    # on gpt, ensure that the partition ends at a sector boundary
-@@ -686,37 +680,45 @@
+@@ -687,37 +681,45 @@
        # reference to the current partition
        my $part = (\%FAI::configs)->{$config}->{partitions}->{$part_id};
  

Modified: branches/experimental/patches/setup-storage_external-journal
===================================================================
--- branches/experimental/patches/setup-storage_external-journal	2010-07-16 14:31:56 UTC (rev 5864)
+++ branches/experimental/patches/setup-storage_external-journal	2010-07-23 09:08:31 UTC (rev 5865)
@@ -9,7 +9,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Commands.pm
 +++ trunk/lib/setup-storage/Commands.pm	
-@@ -54,6 +54,7 @@
+@@ -55,6 +55,7 @@
    defined ($partition->{filesystem})
      or &FAI::internal_error("filesystem is undefined");
    my $fs = $partition->{filesystem};
@@ -17,7 +17,7 @@
  
    return if ($fs eq "-");
  
-@@ -66,13 +67,45 @@
+@@ -67,13 +68,45 @@
    print "$partition->{mountpoint} FS create_options: $create_options\n" if ($FAI::debug && $create_options);
    print "$partition->{mountpoint} FS tune_options: $tune_options\n" if ($FAI::debug && $tune_options);
  
@@ -70,7 +70,7 @@
  
    # possibly tune the file system - this depends on whether the file system
    # supports tuning at all
-@@ -980,12 +1013,14 @@
+@@ -981,12 +1014,14 @@
        }
      }
  
@@ -91,7 +91,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Parser.pm
 +++ trunk/lib/setup-storage/Parser.pm	
-@@ -869,16 +869,24 @@
+@@ -870,16 +870,24 @@
          }
          | /^\S+/
          {

Modified: branches/experimental/patches/setup-storage_lvm-preserve2
===================================================================
--- branches/experimental/patches/setup-storage_lvm-preserve2	2010-07-16 14:31:56 UTC (rev 5864)
+++ branches/experimental/patches/setup-storage_lvm-preserve2	2010-07-23 09:08:31 UTC (rev 5865)
@@ -9,7 +9,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Commands.pm
 +++ trunk/lib/setup-storage/Commands.pm	
-@@ -142,7 +142,7 @@
+@@ -143,7 +143,7 @@
  
    my ($d, $t) = @_;
    my ($i_p_d, $disk, $part_no) = &FAI::phys_dev($d);
@@ -18,7 +18,7 @@
    # make sure this device really exists (we can't check for the partition
    # as that may be created later on
    (-b $disk) or die "Specified disk $disk does not exist in this system!\n";
-@@ -150,6 +150,7 @@
+@@ -151,6 +151,7 @@
    my $cmd = "parted -s $disk set $part_no $t on";
    $cmd = "true" if ($part_no == -1);
    &FAI::push_command( $cmd, "exist_$d", "type_${t}_$d" );
@@ -26,7 +26,7 @@
  }
  
  ################################################################################
-@@ -244,12 +245,17 @@
+@@ -245,12 +246,17 @@
  
        # keep a reference to the current volume
        my $vol = (\%FAI::configs)->{$config}->{volumes}->{$id};
@@ -47,7 +47,7 @@
        # prepend "raid", if the mode is numeric-only
        $level = "raid$level" if ($level =~ /^\d+$/);
  
-@@ -307,29 +313,6 @@
+@@ -308,29 +314,6 @@
  
  ################################################################################
  #
@@ -77,7 +77,7 @@
  # @brief Create the volume group $config, unless it exists already; if the
  # latter is the case, only add/remove the physical devices
  #
-@@ -342,24 +325,6 @@
+@@ -343,24 +326,6 @@
    ($config =~ /^VG_(.+)$/) and ($1 ne "--ANY--") or &FAI::internal_error("Invalid config $config");
    my $vg = $1; # the actual volume group
  
@@ -102,7 +102,7 @@
    my ($pv_create_options) = $FAI::configs{$config}{pvcreateopts};
    my ($vg_create_options) = $FAI::configs{$config}{vgcreateopts};
    # prevent warnings of uninitialized variables
-@@ -367,59 +332,82 @@
+@@ -368,59 +333,82 @@
    $vg_create_options = '' unless $vg_create_options;
    print "/dev/$vg PV create_options: $pv_create_options\n" if ($FAI::debug && $pv_create_options);
    print "/dev/$vg VG create_options: $vg_create_options\n" if ($FAI::debug && $vg_create_options);
@@ -215,7 +215,7 @@
      &FAI::push_command( "vgreduce $vg " . join (" ", keys %rm_devs),
        "vg_extended_$vg$pre_dev", "vg_created_$vg" );
    } else {
-@@ -441,25 +429,6 @@
+@@ -442,25 +430,6 @@
    ($config =~ /^VG_(.+)$/) and ($1 ne "--ANY--") or &FAI::internal_error("Invalid config $config");
    my $vg = $1; # the actual volume group
  
@@ -241,7 +241,7 @@
    # now create or resize the configured logical volumes
    foreach my $lv (keys %{ $FAI::configs{$config}{volumes} }) {
      # reference to the size of the current logical volume
-@@ -482,14 +451,14 @@
+@@ -483,14 +452,14 @@
          $FAI::current_lvm_config{$vg}{volumes}{$lv}{size})
        {
          &FAI::push_command( "parted -s /dev/$vg/$lv resize 1 0 " . $lv_size->{eff_size} .  "B",
@@ -260,7 +260,7 @@
        }
  
        next;
-@@ -498,10 +467,10 @@
+@@ -499,10 +468,10 @@
      my ($create_options) = $FAI::configs{$config}{volumes}{$lv}{lvcreateopts};
      # prevent warnings of uninitialized variables
      $create_options = '' unless $create_options;
@@ -273,7 +273,7 @@
        "exist_/dev/$vg/$lv" );
  
      # create the filesystem on the volume
-@@ -512,6 +481,85 @@
+@@ -513,6 +482,85 @@
  
  ################################################################################
  #
@@ -359,7 +359,7 @@
  # @brief Using the configurations from %FAI::configs, a list of commands is
  # built to setup the LVM
  # creates the volume groups, the logical volumes and the filesystems
-@@ -519,6 +567,17 @@
+@@ -520,6 +568,17 @@
  ################################################################################
  sub build_lvm_commands {
  
@@ -377,7 +377,7 @@
    # loop through all configs
    foreach my $config (keys %FAI::configs) {
  
-@@ -528,24 +587,11 @@
+@@ -529,24 +588,11 @@
      next if ($1 eq "--ANY--");
      my $vg = $1; # the volume group
  
@@ -403,7 +403,7 @@
  
      # perform all necessary operations on the underlying logical volumes
      &FAI::setup_logical_volumes($config);
-@@ -754,8 +800,8 @@
+@@ -755,8 +801,8 @@
      or die "Can't change disklabel, partitions are to be preserved\n";
  
    # write the disklabel to drop the previous partition table
@@ -418,7 +418,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Volumes.pm
 +++ trunk/lib/setup-storage/Volumes.pm	
-@@ -347,7 +347,6 @@
+@@ -348,7 +348,6 @@
    foreach my $vg (get_volume_group_list()) {
      # initialise the hash entry
      $FAI::current_lvm_config{$vg}{physical_volumes} = ();
@@ -426,7 +426,7 @@
  
      # store the vg size in MB
      my %vg_info = get_volume_group_information($vg);
-@@ -366,7 +365,6 @@
+@@ -367,7 +366,6 @@
        $FAI::current_lvm_config{$vg}{volumes}{$short_name}{size} =
          &FAI::convert_unit($lv_info{$lv_name}->{lv_size} .
            $lv_info{$lv_name}->{lv_size_unit});
@@ -434,7 +434,7 @@
      }
  
      # store the physical volumes
-@@ -417,7 +415,6 @@
+@@ -418,7 +416,6 @@
      if ($line =~ /^ARRAY \/dev\/md[\/]?(\d+) level=(\S+) num-devices=\d+(\s+|$)/) {
        $id = $1;
        $FAI::current_raid_config{$id}{mode} = $2;
@@ -442,7 +442,7 @@
      } elsif ($line =~ /^\s*devices=(\S+)$/) {
        defined($id) or &FAI::internal_error("mdadm ARRAY line not yet seen");
        @{ $FAI::current_raid_config{$id}{devices} } = split (",", $1);
-@@ -437,11 +434,17 @@
+@@ -438,11 +435,17 @@
    my ($device_name) = @_;
    my ($i_p_d, $disk, $part_no) = &FAI::phys_dev($device_name);
  
@@ -464,7 +464,7 @@
      if (defined($FAI::configs{RAID}{volumes}{$vol}) && 
          $FAI::configs{RAID}{volumes}{$vol}{preserve} != 1) {
        $FAI::configs{RAID}{volumes}{$vol}{preserve} = 1;
-@@ -450,6 +453,8 @@
+@@ -451,6 +454,8 @@
    } elsif ($device_name =~ m{^/dev/([^/\s]+)/([^/\s]+)$}) {
      my $vg = $1;
      my $lv = $2;
@@ -473,7 +473,7 @@
      if (defined($FAI::configs{"VG_$vg"}{volumes}{$lv}) &&
          $FAI::configs{"VG_$vg"}{volumes}{$lv}{size}{preserve} != 1) {
        $FAI::configs{"VG_$vg"}{volumes}{$lv}{size}{preserve} = 1;
-@@ -480,6 +485,9 @@
+@@ -481,6 +486,9 @@
                defined($FAI::current_config{$1}{partitions}{$part_id})) ? 1 : 0)
            if (2 == $part->{size}->{preserve});
          next unless ($part->{size}->{preserve} || $part->{size}->{resize});
@@ -483,7 +483,7 @@
          defined ($part->{size}->{range}) or die
            "Can't preserve ". &FAI::make_device_name($1, $part->{number})
              . " because it is not defined in the current config\n";
-@@ -495,10 +503,11 @@
+@@ -496,10 +504,11 @@
            if (2 == $FAI::configs{$config}{volumes}{$l}{size}{preserve});
          next unless ($FAI::configs{$config}{volumes}{$l}{size}{preserve} == 1 ||
            $FAI::configs{$config}{volumes}{$l}{size}{resize} == 1);
@@ -496,7 +496,7 @@
        }
      } elsif ($config eq "RAID") {
        # check for volumes that need to be preserved and preserve the underlying
-@@ -508,6 +517,8 @@
+@@ -509,6 +518,8 @@
            (defined($FAI::current_raid_config{$r}) ? 1 : 0)
            if (2 == $FAI::configs{$config}{volumes}{$r}{preserve});
          next unless ($FAI::configs{$config}{volumes}{$r}{preserve} == 1);

Modified: branches/experimental/patches/setup-storage_no-cylinder-boundaries
===================================================================
--- branches/experimental/patches/setup-storage_no-cylinder-boundaries	2010-07-16 14:31:56 UTC (rev 5864)
+++ branches/experimental/patches/setup-storage_no-cylinder-boundaries	2010-07-23 09:08:31 UTC (rev 5865)
@@ -6,7 +6,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Sizes.pm
 +++ trunk/lib/setup-storage/Sizes.pm	
-@@ -559,23 +559,9 @@
+@@ -560,23 +560,9 @@
    $FAI::configs{$config}{partitions}{$part_id}{start_byte} =
      $next_start;
  
@@ -32,7 +32,7 @@
  
    # set $start and $end to the effective values
    $start = $end_byte - $next_start + 1;
-@@ -650,10 +636,6 @@
+@@ -651,10 +637,6 @@
        $next_start = $current_disk->{bios_sectors_per_track} *
          $current_disk->{sector_size};
  
@@ -43,7 +43,7 @@
      } elsif ($FAI::configs{$config}{disklabel} eq "gpt") {
        # on GPT-EFI disk labels the first 34 and last 33 sectors must be left alone
        $next_start = 34 * $current_disk->{sector_size};
-@@ -665,13 +647,12 @@
+@@ -666,13 +648,12 @@
        $min_req_total_space += (34 + 33) * $current_disk->{sector_size};
  
      } elsif ($FAI::configs{$config}{disklabel} eq "gpt-bios") {

Modified: branches/experimental/patches/setup-storage_no-useless-rebuild
===================================================================
--- branches/experimental/patches/setup-storage_no-useless-rebuild	2010-07-16 14:31:56 UTC (rev 5864)
+++ branches/experimental/patches/setup-storage_no-useless-rebuild	2010-07-23 09:08:31 UTC (rev 5865)
@@ -7,7 +7,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Commands.pm
 +++ trunk/lib/setup-storage/Commands.pm	
-@@ -855,6 +855,12 @@
+@@ -856,6 +856,12 @@
  
    # the list of partitions that must be preserved
    my @to_preserve = &FAI::get_preserved_partitions($config);
@@ -20,7 +20,7 @@
  
    my $label = $FAI::configs{$config}{disklabel};
    $label = "gpt" if ($label eq "gpt-bios");
-@@ -865,10 +871,10 @@
+@@ -866,10 +872,10 @@
      or die "Can't change disklabel, partitions are to be preserved\n";
  
    # write the disklabel to drop the previous partition table

Modified: branches/experimental/patches/setup-storage_parted2.2
===================================================================
--- branches/experimental/patches/setup-storage_parted2.2	2010-07-16 14:31:56 UTC (rev 5864)
+++ branches/experimental/patches/setup-storage_parted2.2	2010-07-23 09:08:31 UTC (rev 5865)
@@ -6,7 +6,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Volumes.pm
 +++ trunk/lib/setup-storage/Volumes.pm	
-@@ -177,6 +177,23 @@
+@@ -178,6 +178,23 @@
  #  7      30450018816B  32547432959B  2097414144B   logical   ext3
  #  8      32547465216B  82343278079B  49795812864B  logical   ext3
  #
@@ -30,7 +30,7 @@
  
      # As shown above, some entries may be blank. Thus the exact column starts
      # and lengths must be parsed from the header line. This is stored in the
-@@ -249,9 +266,17 @@
+@@ -250,9 +267,17 @@
          # file system either
          next if ($id eq "");
  

Modified: branches/experimental/patches/setup-storage_preserve-lazy
===================================================================
--- branches/experimental/patches/setup-storage_preserve-lazy	2010-07-16 14:31:56 UTC (rev 5864)
+++ branches/experimental/patches/setup-storage_preserve-lazy	2010-07-23 09:08:31 UTC (rev 5865)
@@ -8,7 +8,7 @@
 ===================================================================
 --- trunk.orig/bin/setup-storage
 +++ trunk/bin/setup-storage	
-@@ -126,10 +126,6 @@
+@@ -127,10 +127,6 @@
  print "Using config file: $opt_f\n";
  &FAI::run_parser($config_file);
  
@@ -19,7 +19,7 @@
  # read the sizes and partition tables of all disks listed in $FAI::disks
  &FAI::get_current_disks;
  
-@@ -139,6 +135,10 @@
+@@ -140,6 +136,10 @@
  # see whether there are any existing RAID devices
  &FAI::get_current_raid;
  
@@ -34,7 +34,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Parser.pm
 +++ trunk/lib/setup-storage/Parser.pm	
-@@ -404,6 +404,10 @@
+@@ -405,6 +405,10 @@
              $FAI::configs{RAID}{volumes}{$_}{preserve} = 1 foreach (split(",", $1));
            }
          }
@@ -45,7 +45,7 @@
          | /^fstabkey:(device|label|uuid)/
          {
            # the information preferred for fstab device identifieres
-@@ -421,7 +425,7 @@
+@@ -422,7 +426,7 @@
            foreach (split (",", $1)) {
              (m{^([^/,\s\-]+)-([^/,\s\-]+)}) or 
                die &FAI::internal_error("VG re-parse failed");
@@ -54,7 +54,7 @@
            }
          }
          | m{^preserve_reinstall:([^/,\s\-]+-[^/,\s\-]+(,[^/,\s\-]+-[^/,\s\-]+)*)}
-@@ -431,17 +435,25 @@
+@@ -432,17 +436,25 @@
              foreach (split (",", $1)) {
                (m{^([^/,\s\-]+)-([^/,\s\-]+)}) or 
                  die &FAI::internal_error("VG re-parse failed");
@@ -82,7 +82,7 @@
            }
          }
          | /^fstabkey:(device|label|uuid)/
-@@ -465,6 +477,11 @@
+@@ -466,6 +478,11 @@
              $FAI::configs{$FAI::device}{preserveparts} = 1;
            }
          }
@@ -98,7 +98,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Volumes.pm
 +++ trunk/lib/setup-storage/Volumes.pm	
-@@ -475,6 +475,10 @@
+@@ -476,6 +476,10 @@
      if ($config =~ /^PHY_(.+)$/) {
        foreach my $part_id (&numsort(keys %{ $FAI::configs{$config}{partitions} })) {
          my $part = (\%FAI::configs)->{$config}->{partitions}->{$part_id};
@@ -109,7 +109,7 @@
          next unless ($part->{size}->{preserve} || $part->{size}->{resize});
          defined ($part->{size}->{range}) or die
            "Can't preserve ". &FAI::make_device_name($1, $part->{number})
-@@ -485,6 +489,10 @@
+@@ -486,6 +490,10 @@
        # check for logical volumes that need to be preserved and preserve the
        # underlying devices recursively
        foreach my $l (keys %{ $FAI::configs{$config}{volumes} }) {
@@ -120,7 +120,7 @@
          next unless ($FAI::configs{$config}{volumes}{$l}{size}{preserve} == 1 ||
            $FAI::configs{$config}{volumes}{$l}{size}{resize} == 1);
          defined ($FAI::configs{$config}{volumes}{$l}{size}{range}) or die
-@@ -496,6 +504,9 @@
+@@ -497,6 +505,9 @@
        # check for volumes that need to be preserved and preserve the underlying
        # devices recursively
        foreach my $r (keys %{ $FAI::configs{$config}{volumes} }) {

Modified: branches/experimental/patches/setup-storage_ramsize
===================================================================
--- branches/experimental/patches/setup-storage_ramsize	2010-07-16 14:31:56 UTC (rev 5864)
+++ branches/experimental/patches/setup-storage_ramsize	2010-07-23 09:08:31 UTC (rev 5865)
@@ -7,7 +7,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Parser.pm
 +++ trunk/lib/setup-storage/Parser.pm	
-@@ -307,6 +307,21 @@
+@@ -308,6 +308,21 @@
  {
    my ($val) = @_;
  
@@ -29,7 +29,7 @@
    ## don't warn for now, G/GiB/GB are all treated the same way
    ## ($val =~ /([kKMGTP])\s*$/) and
    ##   warn "Using $1 as size modifier is deprecated, please use $1iB or $1B
-@@ -673,17 +688,17 @@
+@@ -674,17 +689,17 @@
            1;
          }
  
@@ -51,7 +51,7 @@
            {
              # range has no upper limit, assume the whole disk
              $range = "${range}100%";
-@@ -699,12 +714,12 @@
+@@ -700,12 +715,12 @@
            # enter the range into the hash
            $FAI::partition_pointer->{size}->{range} = $range;
            # set the resize flag, if required
@@ -66,7 +66,7 @@
          {
            # complete the range by assuming 0 as the lower limit 
            my $range = "0$1";
-@@ -718,7 +733,7 @@
+@@ -719,7 +734,7 @@
            # enter the range into the hash
            $FAI::partition_pointer->{size}->{range} = $range;
            # set the resize flag, if required

Modified: branches/experimental/patches/setup-storage_resize2fs
===================================================================
--- branches/experimental/patches/setup-storage_resize2fs	2010-07-16 14:31:56 UTC (rev 5864)
+++ branches/experimental/patches/setup-storage_resize2fs	2010-07-23 09:08:31 UTC (rev 5865)
@@ -8,7 +8,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Commands.pm
 +++ trunk/lib/setup-storage/Commands.pm	
-@@ -447,18 +447,38 @@
+@@ -448,18 +448,38 @@
          or die "Resized volume $vg/$lv does not exist\n";
        warn "$vg/$lv will be resized\n";
  
@@ -55,7 +55,7 @@
        }
  
        next;
-@@ -470,7 +490,7 @@
+@@ -471,7 +491,7 @@
      print "/dev/$vg/$lv LV create_options: $create_options\n" if ($FAI::debug && $create_options);
      # create a new volume
      &FAI::push_command( "lvcreate $create_options -n $lv -L " .
@@ -64,7 +64,7 @@
        "exist_/dev/$vg/$lv" );
  
      # create the filesystem on the volume
-@@ -875,25 +895,42 @@
+@@ -876,25 +896,42 @@
      my $start = $part->{start_byte};
      my $end = $part->{end_byte};
  
@@ -117,7 +117,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Sizes.pm
 +++ trunk/lib/setup-storage/Sizes.pm	
-@@ -251,7 +251,7 @@
+@@ -252,7 +252,7 @@
        # the size is fixed
        if ($start == $end) { 
          # write the size back to the configuration
@@ -126,7 +126,7 @@
        } else {
  
          # add this volume to the redistribution list
-@@ -281,7 +281,7 @@
+@@ -282,7 +282,7 @@
  
        # write the final size
        $FAI::configs{$config}{volumes}{$lv}{size}{eff_size} =
@@ -139,7 +139,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Volumes.pm
 +++ trunk/lib/setup-storage/Volumes.pm	
-@@ -351,10 +351,10 @@
+@@ -352,10 +352,10 @@
      # store the vg size in MB
      my %vg_info = get_volume_group_information($vg);
      if (%vg_info) {

Modified: branches/experimental/patches/setup-storage_tmpfs
===================================================================
--- branches/experimental/patches/setup-storage_tmpfs	2010-07-16 14:31:56 UTC (rev 5864)
+++ branches/experimental/patches/setup-storage_tmpfs	2010-07-23 09:08:31 UTC (rev 5865)
@@ -10,7 +10,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Commands.pm
 +++ trunk/lib/setup-storage/Commands.pm	
-@@ -236,8 +236,8 @@
+@@ -237,8 +237,8 @@
  sub build_raid_commands {
  
    foreach my $config (keys %FAI::configs) { # loop through all configs
@@ -21,7 +21,7 @@
      ($config eq "RAID") or &FAI::internal_error("Invalid config $config");
  
      # create all raid devices
-@@ -613,8 +613,8 @@
+@@ -614,8 +614,8 @@
    # loop through all configs
    foreach my $config (keys %FAI::configs) {
  
@@ -32,7 +32,7 @@
      ($config =~ /^VG_(.+)$/) or &FAI::internal_error("Invalid config $config");
      next if ($1 eq "--ANY--");
      my $vg = $1; # the volume group
-@@ -1026,8 +1026,8 @@
+@@ -1027,8 +1027,8 @@
  
    # loop through all configs
    foreach my $config ( keys %FAI::configs ) {
@@ -47,7 +47,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Fstab.pm
 +++ trunk/lib/setup-storage/Fstab.pm	
-@@ -58,9 +58,10 @@
+@@ -59,9 +59,10 @@
    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
@@ -59,7 +59,7 @@
  
    # set the ROOT_PARTITION variable, if this is the mountpoint for /
    $FAI::disk_var{ROOT_PARTITION} = $name
-@@ -168,6 +169,9 @@
+@@ -169,6 +170,9 @@
          return $this_mp if ($this_mp eq "/boot");
          $mnt_point = $this_mp if ($this_mp eq "/");
        }
@@ -69,7 +69,7 @@
      } else {
        &FAI::internal_error("Unexpected key $c");
      }
-@@ -312,6 +316,26 @@
+@@ -313,6 +317,26 @@
  
          push @fstab, &FAI::create_fstab_line($c_ref, $device_name, $device_name);
        }
@@ -100,7 +100,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Parser.pm
 +++ trunk/lib/setup-storage/Parser.pm	
-@@ -398,6 +398,12 @@
+@@ -399,6 +399,12 @@
            # exit config mode
            $FAI::device = "";
          }
@@ -113,7 +113,7 @@
          | /^disk(\d+)/
          {
            # check, whether parted is available
-@@ -616,6 +622,26 @@
+@@ -617,6 +623,26 @@
            $FAI::partition_pointer = (\%FAI::configs)->{CRYPT}->{volumes}->{$vol_id};
          }
          mountpoint devices filesystem mount_options lv_or_fsopts
@@ -140,7 +140,7 @@
          | type mountpoint size filesystem mount_options lv_or_fsopts
  
      type: 'primary'
-@@ -740,6 +766,27 @@
+@@ -741,6 +767,27 @@
          }
          | <error: invalid partition size near "$text">
  
@@ -172,7 +172,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Sizes.pm
 +++ trunk/lib/setup-storage/Sizes.pm	
-@@ -201,8 +201,8 @@
+@@ -202,8 +202,8 @@
    # loop through all device configurations
    foreach my $config (keys %FAI::configs) {
  
@@ -183,7 +183,7 @@
      ($config =~ /^VG_(.+)$/) or &FAI::internal_error("invalid config entry $config");
      next if ($1 eq "--ANY--");
      my $vg = $1; # the volume group name
-@@ -597,8 +597,8 @@
+@@ -598,8 +598,8 @@
    # loop through all device configurations
    foreach my $config (keys %FAI::configs) {
  
@@ -198,7 +198,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Volumes.pm
 +++ trunk/lib/setup-storage/Volumes.pm	
-@@ -65,6 +65,9 @@
+@@ -66,6 +66,9 @@
      } elsif ($config eq "CRYPT") {
        # devices must be one of the above already
        next;
@@ -208,7 +208,7 @@
      } else {
        &FAI::internal_error("Unexpected key $config");
      }
-@@ -555,6 +558,9 @@
+@@ -556,6 +559,9 @@
      } elsif ($config eq "CRYPT") {
        # We don't do preserve for encrypted partitions
        next;

Modified: branches/experimental/patches/setup-storage_used-devs-only
===================================================================
--- branches/experimental/patches/setup-storage_used-devs-only	2010-07-16 14:31:56 UTC (rev 5864)
+++ branches/experimental/patches/setup-storage_used-devs-only	2010-07-23 09:08:31 UTC (rev 5865)
@@ -6,7 +6,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Volumes.pm
 +++ trunk/lib/setup-storage/Volumes.pm	
-@@ -37,18 +37,60 @@
+@@ -38,18 +38,60 @@
  
  ################################################################################
  #




More information about the Fai-commit mailing list