[Fai-commit] r4606 - people/michael/features/setup_harddisks_2/implementation

[michael-guest at alioth.debian.org]

Author: michael-guest
Date: 2007-10-09 10:39:44 +0000 (Tue, 09 Oct 2007)
New Revision: 4606

Modified:
   people/michael/features/setup_harddisks_2/implementation/shdd2
   people/michael/features/setup_harddisks_2/implementation/shdd2-parser
   people/michael/features/setup_harddisks_2/implementation/shdd2-volumes
Log:
fixed bugs:
  - vgdisplay might use units other than GB
  - vg may also be the prefix of a volume group name


Modified: people/michael/features/setup_harddisks_2/implementation/shdd2
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/shdd2	2007-10-08 21:34:06 UTC (rev 4605)
+++ people/michael/features/setup_harddisks_2/implementation/shdd2	2007-10-09 10:39:44 UTC (rev 4606)
@@ -45,7 +45,7 @@
 # - parted, libparse-recdescent-perl must get installed in nfsroot (add Depends:
 #   to fai-nfsroot package)
 # 
-# - closes #380629, #330915, #277045, #356862
+# - closes #380629, #330915, #277045, #356862, #416633
 # - no-bug: #364763
 #
 # - auto mode (something like auto:server, auto:desktop?)
@@ -53,9 +53,14 @@
 #
 # - resize should imply resizing the filesystem as well (unless this is done by
 #   parted already, needs to be checked)
+# - LVMs definitely require resizing the filesystem
 # - more error messages must be caught by shdd2-exec
 # - how to detect old-style config files? migration strategies?
 # - implement disklabels other than msdos and gpt
+# - the RAID commands are surely incomplete and lack any management of
+#   unanticipated situations
+# - try to get libparted-swig-perl and use that one instead of the manual
+#   parsing
 ################################################################################
 
 

Modified: people/michael/features/setup_harddisks_2/implementation/shdd2-parser
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/shdd2-parser	2007-10-08 21:34:06 UTC (rev 4605)
+++ people/michael/features/setup_harddisks_2/implementation/shdd2-parser	2007-10-09 10:39:44 UTC (rev 4606)
@@ -448,7 +448,7 @@
           $FAI::configs{ $FAI::device }{ "fstabkey" } = $1;
         }
 
-    volume: 'vg' name devices
+    volume: /^vg\s+/ name devices
         | /^raid([0156])\s+/
         {
           # make sure that this is a RAID configuration

Modified: people/michael/features/setup_harddisks_2/implementation/shdd2-volumes
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/shdd2-volumes	2007-10-08 21:34:06 UTC (rev 4605)
+++ people/michael/features/setup_harddisks_2/implementation/shdd2-volumes	2007-10-09 10:39:44 UTC (rev 4606)
@@ -376,7 +376,7 @@
   # parse the output line by line and call vgdisplay -v <VG>
   foreach my $line ( @vgdisplay_print )
   {
-    ( $line =~ /^\s*"(\S+)"\s+\d+\.\d+ GB\s+\[\d+\.\d+ GB\s+used \/ \d+\.\d+ GB\s+free\]$/ )
+    ( $line =~ /^\s*"(\S+)"\s+\d+\.\d+ [MGT]B\s+\[\d+\.\d+ [MGT]B\s+used \/ \d+\.\d+ [MGT]B\s+free\]$/ )
       or die "Unexpected vgdisplay output $line";
 
     # the name of the volume group