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

Sat May 29 16:48:46 UTC 2010

Author: mt
Date: 2010-05-29 16:48:43 +0000 (Sat, 29 May 2010)
New Revision: 5792

Added:
   branches/experimental/patches/setup-storage_cciss-bugfix
Modified:
   branches/experimental/patches/grub-pc
   branches/experimental/patches/series
   branches/experimental/patches/setup-storage_external-journal
   branches/experimental/patches/setup-storage_ramsize
   branches/experimental/patches/setup-storage_tmpfs
Log:
added bugfix for cciss-without-partition problem


Modified: branches/experimental/patches/grub-pc
===================================================================

--- branches/experimental/patches/grub-pc	2010-05-28 15:44:15 UTC (rev 5791)
+++ branches/experimental/patches/grub-pc	2010-05-29 16:48:43 UTC (rev 5792)
@@ -8,10 +8,10 @@
 		volumes and RAID volumes are resolved to underlying disks.
 	* setup-storage.8: Documented this new behavior
 	* Makefile: Make sure that all example scripts are executable
-Index: trunk-w-exp/Makefile
+Index: trunk/Makefile
 ===================================================================
---- trunk-w-exp.orig/Makefile	2010-05-28 11:22:37.000000000 +0200
-+++ trunk-w-exp/Makefile	2010-05-28 11:23:00.000000000 +0200
+--- trunk.orig/Makefile
++++ trunk/Makefile	
 @@ -47,6 +47,7 @@
  	install -p -m644 pixmaps/*.gif $(DESTDIR)/usr/share/fai/pixmaps
  	perl -pi -e 's/FAIVERSIONSTRING/$(VERSIONSTRING)/' $(DESTDIR)/usr/sbin/fai
@@ -20,10 +20,10 @@
  	cp -a utils $(DOCDIR)/examples
  	find $(DOCDIR) -name .svn | xargs rm -rf
  
-Index: trunk-w-exp/examples/simple/package_config/DEFAULT
+Index: trunk/examples/simple/package_config/DEFAULT
 ===================================================================
---- trunk-w-exp.orig/examples/simple/package_config/DEFAULT	2010-05-28 11:22:37.000000000 +0200
-+++ trunk-w-exp/examples/simple/package_config/DEFAULT	2010-05-28 11:23:00.000000000 +0200
+--- trunk.orig/examples/simple/package_config/DEFAULT
++++ trunk/examples/simple/package_config/DEFAULT	
 @@ -17,10 +17,10 @@
  dhcp3-client
  
@@ -37,10 +37,10 @@
  PACKAGES aptitude LILO
 -lilo grub-
 +lilo grub- grub-pc-
-Index: trunk-w-exp/examples/simple/scripts/GRUB_PC/10-setup
+Index: trunk/examples/simple/scripts/GRUB_PC/10-setup
 ===================================================================
---- trunk-w-exp.orig/examples/simple/scripts/GRUB_PC/10-setup	2010-05-28 11:22:37.000000000 +0200
-+++ trunk-w-exp/examples/simple/scripts/GRUB_PC/10-setup	2010-05-28 11:23:00.000000000 +0200
+--- trunk.orig/examples/simple/scripts/GRUB_PC/10-setup
++++ trunk/examples/simple/scripts/GRUB_PC/10-setup	
 @@ -2,8 +2,25 @@
  
  error=0 ; trap "error=$((error|1))" ERR
@@ -70,29 +70,29 @@
  
  exit $error
 +
-Index: trunk-w-exp/examples/simple/class/50-host-classes
+Index: trunk/examples/simple/class/50-host-classes
 ===================================================================
---- trunk-w-exp.orig/examples/simple/class/50-host-classes	2010-05-28 11:22:37.000000000 +0200
-+++ trunk-w-exp/examples/simple/class/50-host-classes	2010-05-28 11:23:00.000000000 +0200
+--- trunk.orig/examples/simple/class/50-host-classes
++++ trunk/examples/simple/class/50-host-classes	
 @@ -20,5 +20,4 @@
  	echo "FAIBASE DHCPC" ;;
  esac
  
 -(ifclass I386 || ifclass AMD64) && echo GRUB 
  exit 0
-Index: trunk-w-exp/examples/simple/class/51-grub
+Index: trunk/examples/simple/class/51-grub
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ trunk-w-exp/examples/simple/class/51-grub	2010-05-28 11:23:00.000000000 +0200
++++ trunk/examples/simple/class/51-grub	
 @@ -0,0 +1,4 @@
 +#! /bin/bash
 +
 +{ ifclass I386 || ifclass AMD64; } && ! ifclass GRUB_PC && echo GRUB
 +exit 0
-Index: trunk-w-exp/lib/setup-storage/Fstab.pm
+Index: trunk/lib/setup-storage/Fstab.pm
 ===================================================================
---- trunk-w-exp.orig/lib/setup-storage/Fstab.pm	2010-05-28 11:22:37.000000000 +0200
-+++ trunk-w-exp/lib/setup-storage/Fstab.pm	2010-05-28 11:24:14.000000000 +0200
+--- trunk.orig/lib/setup-storage/Fstab.pm
++++ trunk/lib/setup-storage/Fstab.pm	
 @@ -127,6 +127,54 @@
    }
  }
@@ -246,10 +246,10 @@
    $FAI::disk_var{BOOT_DEVICE} =~ s/\s*$/"/;
  
    # sort the lines in @fstab to enable all sub mounts
-Index: trunk-w-exp/man/setup-storage.8
+Index: trunk/man/setup-storage.8
 ===================================================================
---- trunk-w-exp.orig/man/setup-storage.8	2010-05-28 11:22:37.000000000 +0200
-+++ trunk-w-exp/man/setup-storage.8	2010-05-28 11:23:00.000000000 +0200
+--- trunk.orig/man/setup-storage.8
++++ trunk/man/setup-storage.8	
 @@ -106,10 +106,9 @@
  .IR SWAPLIST ,
  .IR ROOT_PARTITION ,

Modified: branches/experimental/patches/series
===================================================================
--- branches/experimental/patches/series	2010-05-28 15:44:15 UTC (rev 5791)
+++ branches/experimental/patches/series	2010-05-29 16:48:43 UTC (rev 5792)
@@ -19,3 +19,4 @@
 setup-storage_tmpfs
 setup-storage_external-journal
 
+setup-storage_cciss-bugfix

Added: branches/experimental/patches/setup-storage_cciss-bugfix
===================================================================
--- branches/experimental/patches/setup-storage_cciss-bugfix	                        (rev 0)
+++ branches/experimental/patches/setup-storage_cciss-bugfix	2010-05-29 16:48:43 UTC (rev 5792)
@@ -0,0 +1,22 @@
+2010-05-29  Michael Tautschnig  <mt at debian.org>
+
+	* setup-storage/Init.pm: Properly handle /dev/cciss disk devices, even without
+		partitions (thanks Steffen Grunewald <steffen.grunewald at aei.mpg.de> and
+		Mathieu Alorent <malorent at echo.fr>).
+Index: trunk/lib/setup-storage/Init.pm
+===================================================================
+--- trunk.orig/lib/setup-storage/Init.pm
++++ trunk/lib/setup-storage/Init.pm	
+@@ -182,10 +182,10 @@
+     return (1, "/dev/$1", $2);
+   }
+   elsif ($dev =~
+-    m{^/dev/(cciss/c\dd\d|ida/c\dd\d|rd/c\dd\d|ataraid/d\d|etherd/e\d+\.\d+)p(\d+)?$})
++    m{^/dev/(cciss/c\dd\d|ida/c\dd\d|rd/c\dd\d|ataraid/d\d|etherd/e\d+\.\d+)(p(\d+))?$})
+   {
+     defined($2) or return (1, "/dev/$1", -1);
+-    return (1, "/dev/$1", $2);
++    return (1, "/dev/$1", $3);
+   }
+   # TODO: handle /dev/mapper devices
+   return (0, "", -2);

Modified: branches/experimental/patches/setup-storage_external-journal
===================================================================
--- branches/experimental/patches/setup-storage_external-journal	2010-05-28 15:44:15 UTC (rev 5791)
+++ branches/experimental/patches/setup-storage_external-journal	2010-05-29 16:48:43 UTC (rev 5792)
@@ -5,10 +5,10 @@
 	FS:journal=.
 	* man/setup-storage.8: document external journal support.
 
-Index: trunk-w-exp/lib/setup-storage/Commands.pm
+Index: trunk/lib/setup-storage/Commands.pm
 ===================================================================
---- trunk-w-exp.orig/lib/setup-storage/Commands.pm	2010-05-27 16:02:39.000000000 +0200
-+++ trunk-w-exp/lib/setup-storage/Commands.pm	2010-05-27 16:10:11.000000000 +0200
+--- trunk.orig/lib/setup-storage/Commands.pm
++++ trunk/lib/setup-storage/Commands.pm	
 @@ -54,6 +54,7 @@
    defined ($partition->{filesystem})
      or &FAI::internal_error("filesystem is undefined");
@@ -83,10 +83,10 @@
      $fs = $FAI::current_config{$disk}{partitions}{$mapped_id}{filesystem}
        if ($part->{size}->{preserve} || $part->{size}->{resize});
      $fs = "" if ($fs eq "-");
-Index: trunk-w-exp/lib/setup-storage/Parser.pm
+Index: trunk/lib/setup-storage/Parser.pm
 ===================================================================
---- trunk-w-exp.orig/lib/setup-storage/Parser.pm	2010-05-27 16:02:39.000000000 +0200
-+++ trunk-w-exp/lib/setup-storage/Parser.pm	2010-05-27 16:10:11.000000000 +0200
+--- trunk.orig/lib/setup-storage/Parser.pm
++++ trunk/lib/setup-storage/Parser.pm	
 @@ -869,16 +869,24 @@
          }
          | /^\S+/
@@ -115,10 +115,10 @@
            }
          }
  
-Index: trunk-w-exp/man/setup-storage.8
+Index: trunk/man/setup-storage.8
 ===================================================================
---- trunk-w-exp.orig/man/setup-storage.8	2010-05-27 16:45:57.000000000 +0200
-+++ trunk-w-exp/man/setup-storage.8	2010-05-27 16:28:07.000000000 +0200
+--- trunk.orig/man/setup-storage.8
++++ trunk/man/setup-storage.8	
 @@ -537,6 +537,33 @@
  .IP \(bu
  Mount a tmpfs on /scratch with a maximum size of 3 GiB.

Modified: branches/experimental/patches/setup-storage_ramsize
===================================================================
--- branches/experimental/patches/setup-storage_ramsize	2010-05-28 15:44:15 UTC (rev 5791)
+++ branches/experimental/patches/setup-storage_ramsize	2010-05-29 16:48:43 UTC (rev 5792)
@@ -3,10 +3,10 @@
 	convert_units().
 	* man/setup-storage.8: document RAM:XX%.
 
-Index: trunk-w-exp/lib/setup-storage/Parser.pm
+Index: trunk/lib/setup-storage/Parser.pm
 ===================================================================
---- trunk-w-exp.orig/lib/setup-storage/Parser.pm	2010-05-27 15:24:30.000000000 +0200
-+++ trunk-w-exp/lib/setup-storage/Parser.pm	2010-05-27 15:24:18.000000000 +0200
+--- trunk.orig/lib/setup-storage/Parser.pm
++++ trunk/lib/setup-storage/Parser.pm	
 @@ -307,6 +307,21 @@
  {
    my ($val) = @_;
@@ -75,10 +75,10 @@
              $FAI::partition_pointer->{size}->{resize} = 1;
              $FAI::configs{$FAI::device}{preserveparts} = 1;
            }
-Index: trunk-w-exp/man/setup-storage.8
+Index: trunk/man/setup-storage.8
 ===================================================================
---- trunk-w-exp.orig/man/setup-storage.8	2010-05-27 15:24:30.000000000 +0200
-+++ trunk-w-exp/man/setup-storage.8	2010-05-27 15:24:18.000000000 +0200
+--- trunk.orig/man/setup-storage.8
++++ trunk/man/setup-storage.8	
 @@ -341,19 +341,19 @@
  .br
  

Modified: branches/experimental/patches/setup-storage_tmpfs
===================================================================
--- branches/experimental/patches/setup-storage_tmpfs	2010-05-28 15:44:15 UTC (rev 5791)
+++ branches/experimental/patches/setup-storage_tmpfs	2010-05-29 16:48:43 UTC (rev 5792)
@@ -6,10 +6,10 @@
 	support).
 	* man/setup-storage.8: document the tmpfs stanza.
 
-Index: trunk-w-exp/lib/setup-storage/Commands.pm
+Index: trunk/lib/setup-storage/Commands.pm
 ===================================================================
---- trunk-w-exp.orig/lib/setup-storage/Commands.pm	2010-05-27 16:02:39.000000000 +0200
-+++ trunk-w-exp/lib/setup-storage/Commands.pm	2010-05-27 16:02:39.000000000 +0200
+--- trunk.orig/lib/setup-storage/Commands.pm
++++ trunk/lib/setup-storage/Commands.pm	
 @@ -235,8 +235,8 @@
  sub build_raid_commands {
  
@@ -43,10 +43,10 @@
      ($config =~ /^PHY_(.+)$/) or &FAI::internal_error("Invalid config $config");
      my $disk = $1; # the device to be configured
  
-Index: trunk-w-exp/lib/setup-storage/Fstab.pm
+Index: trunk/lib/setup-storage/Fstab.pm
 ===================================================================
---- trunk-w-exp.orig/lib/setup-storage/Fstab.pm	2010-05-27 16:02:39.000000000 +0200
-+++ trunk-w-exp/lib/setup-storage/Fstab.pm	2010-05-27 16:02:39.000000000 +0200
+--- trunk.orig/lib/setup-storage/Fstab.pm
++++ trunk/lib/setup-storage/Fstab.pm	
 @@ -58,9 +58,10 @@
    push @fstab_line, ($d_ref->{mountpoint}, $d_ref->{filesystem},
      $d_ref->{mount_options}, 0, 2);
@@ -59,7 +59,7 @@
  
    # set the ROOT_PARTITION variable, if this is the mountpoint for /
    $FAI::disk_var{ROOT_PARTITION} = $name
-@@ -159,6 +160,9 @@
+@@ -168,6 +169,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");
      }
-@@ -303,6 +307,26 @@
+@@ -312,6 +316,26 @@
  
          push @fstab, &FAI::create_fstab_line($c_ref, $device_name, $device_name);
        }
@@ -96,10 +96,10 @@
      } else {
        &FAI::internal_error("Unexpected key $c");
      }
-Index: trunk-w-exp/lib/setup-storage/Parser.pm
+Index: trunk/lib/setup-storage/Parser.pm
 ===================================================================
---- trunk-w-exp.orig/lib/setup-storage/Parser.pm	2010-05-27 16:02:39.000000000 +0200
-+++ trunk-w-exp/lib/setup-storage/Parser.pm	2010-05-27 16:02:39.000000000 +0200
+--- trunk.orig/lib/setup-storage/Parser.pm
++++ trunk/lib/setup-storage/Parser.pm	
 @@ -398,6 +398,12 @@
            # exit config mode
            $FAI::device = "";
@@ -168,10 +168,10 @@
      devices: /^([^\d,:\s\-][^,:\s]*(:(spare|missing))*(,[^,:\s]+(:(spare|missing))*)*)/
          {
            # split the device list by ,
-Index: trunk-w-exp/lib/setup-storage/Sizes.pm
+Index: trunk/lib/setup-storage/Sizes.pm
 ===================================================================
---- trunk-w-exp.orig/lib/setup-storage/Sizes.pm	2010-05-27 16:02:39.000000000 +0200
-+++ trunk-w-exp/lib/setup-storage/Sizes.pm	2010-05-27 16:02:39.000000000 +0200
+--- trunk.orig/lib/setup-storage/Sizes.pm
++++ trunk/lib/setup-storage/Sizes.pm	
 @@ -201,8 +201,8 @@
    # loop through all device configurations
    foreach my $config (keys %FAI::configs) {
@@ -194,10 +194,10 @@
      ($config =~ /^PHY_(.+)$/) or &FAI::internal_error("invalid config entry $config");
      # nothing to be done, if this is a configuration for a virtual disk
      next if $FAI::configs{$config}{virtual};
-Index: trunk-w-exp/lib/setup-storage/Volumes.pm
+Index: trunk/lib/setup-storage/Volumes.pm
 ===================================================================
---- trunk-w-exp.orig/lib/setup-storage/Volumes.pm	2010-05-27 16:02:39.000000000 +0200
-+++ trunk-w-exp/lib/setup-storage/Volumes.pm	2010-05-27 16:02:39.000000000 +0200
+--- trunk.orig/lib/setup-storage/Volumes.pm
++++ trunk/lib/setup-storage/Volumes.pm	
 @@ -65,6 +65,9 @@
      } elsif ($config eq "CRYPT") {
        # devices must be one of the above already
@@ -218,10 +218,10 @@
      } else {
        &FAI::internal_error("Unexpected key $config");
      }
-Index: trunk-w-exp/man/setup-storage.8
+Index: trunk/man/setup-storage.8
 ===================================================================
---- trunk-w-exp.orig/man/setup-storage.8	2010-05-27 16:02:39.000000000 +0200
-+++ trunk-w-exp/man/setup-storage.8	2010-05-27 16:08:41.000000000 +0200
+--- trunk.orig/man/setup-storage.8
++++ trunk/man/setup-storage.8	
 @@ -137,6 +137,8 @@
  .br
             | disk_config cryptsetup( <cryptsetupoption>)*


