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

[Michael Tautschnig]

Author: mt
Date: 2010-09-17 21:14:02 +0000 (Fri, 17 Sep 2010)
New Revision: 6062

Removed:
   branches/experimental/patches/setup-storage_no-readlink
Modified:
   branches/experimental/patches/grub-pc
   branches/experimental/patches/series
Log:
setup-storage_no-readlink got merged into trunk


Modified: branches/experimental/patches/grub-pc
===================================================================
--- branches/experimental/patches/grub-pc	2010-09-17 21:11:16 UTC (rev 6061)
+++ branches/experimental/patches/grub-pc	2010-09-17 21:14:02 UTC (rev 6062)
@@ -178,9 +178,9 @@
          }
  
          push @fstab, &FAI::create_fstab_line($p_ref,
-@@ -217,15 +264,13 @@
+@@ -203,15 +250,13 @@
  
-         my $device_name = $fstab_key[0];
+         my $device_name = "/dev/$device/$l";
  
 -        # according to http://grub.enbug.org/LVMandRAID, this should work...
 -        # if the mount point is / or /boot, the variables should be set, unless
@@ -201,7 +201,7 @@
          }
  
          push @fstab, &FAI::create_fstab_line($l_ref,
-@@ -244,15 +289,13 @@
+@@ -230,15 +275,13 @@
  
          my $device_name = "/dev/md$r";
  
@@ -224,7 +224,7 @@
          }
  
          push @fstab, &FAI::create_fstab_line($r_ref,
-@@ -266,8 +309,7 @@
+@@ -252,8 +295,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);
-@@ -305,7 +347,10 @@
+@@ -291,7 +333,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-09-17 21:11:16 UTC (rev 6061)
+++ branches/experimental/patches/series	2010-09-17 21:14:02 UTC (rev 6062)
@@ -12,4 +12,3 @@
 setup-storage_preserve-format-all
 setup-storage_gpt-bios-fix
 setup-storage_user-100-percent
-setup-storage_no-readlink

Deleted: branches/experimental/patches/setup-storage_no-readlink
===================================================================
--- branches/experimental/patches/setup-storage_no-readlink	2010-09-17 21:11:16 UTC (rev 6061)
+++ branches/experimental/patches/setup-storage_no-readlink	2010-09-17 21:14:02 UTC (rev 6062)
@@ -1,32 +0,0 @@
-2010-09-17  Michael Tautschnig  <mt at debian.org>
-
-	* setup-storage/Fstab.pm: Don't resolve LVM devices via readlink; the
-		underlying canoncial path names aren't stable across reboots (thanks Brian
-		Kroth for suggesting a similar patch).
-Index: trunk/lib/setup-storage/Fstab.pm
-===================================================================
---- trunk.orig/lib/setup-storage/Fstab.pm
-+++ trunk/lib/setup-storage/Fstab.pm	
-@@ -248,21 +248,7 @@
-         # skip entries without a mountpoint
-         next if ($l_ref->{mountpoint} eq "-");
- 
--        # real device name
--        my @fstab_key = ();
--
--        # resolve the symlink to the real device
--        # and write it as the first entry
--        &FAI::execute_ro_command("readlink -f /dev/$device/$l", \@fstab_key, 0);
--
--        # remove the newline
--        chomp ($fstab_key[0]);
--
--        # make sure we got back a real device
--        ($FAI::no_dry_run == 0 || -b $fstab_key[0]) 
--          or die "Failed to resolve /dev/$device/$l\n";
--
--        my $device_name = $fstab_key[0];
-+        my $device_name = "/dev/$device/$l";
- 
-         # if the mount point the /boot mount point, variables must be set
-         if ($l_ref->{mountpoint} eq $boot_mnt_point) {