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

[Michael Tautschnig]

Author: mt
Date: 2011-10-22 08:11:19 +0000 (Sat, 22 Oct 2011)
New Revision: 6700

Modified:
   branches/experimental/patches/setup-storage_keep-flags
Log:
setup-storage: fix empty flags case


Modified: branches/experimental/patches/setup-storage_keep-flags
===================================================================
--- branches/experimental/patches/setup-storage_keep-flags	2011-10-22 07:59:42 UTC (rev 6699)
+++ branches/experimental/patches/setup-storage_keep-flags	2011-10-22 08:11:19 UTC (rev 6700)
@@ -67,7 +67,7 @@
          defined($FAI::configs{"PHY_$disk"}));
  
      &FAI::push_command( "pvcreate -ff -y $pv_create_options $dev",
-@@ -1169,30 +1169,24 @@
+@@ -1169,30 +1169,25 @@
      $cmd = "losetup -o $start $dn $disk" if ((&FAI::loopback_dev($disk))[0]);
      &FAI::push_command($cmd, "prep2_$dn", "exist_$dn");
  
@@ -80,6 +80,7 @@
 +    # set the bios_grub flag on BIOS compatible GPT tables
 +    $flags .= ",bios_grub" if($FAI::configs{$config}{disklabel} eq "gpt-bios"
 +      && $FAI::configs{$config}{gpt_bios_part} == $part_id);
++	  $flags =~ s/^,//;
 +    &FAI::set_partition_flag_on_phys_dev($dn, $_)
 +      foreach (split(',', $flags));
 +
@@ -110,7 +111,7 @@
  }
  
  
-@@ -1293,6 +1287,10 @@
+@@ -1293,6 +1288,10 @@
  
        # build a parted command to create the partition
        &FAI::execute_command("parted -s $disk mkpart $part_type \"$fs\" ${start}B ${end}B");