[2811] only consider fstab from the selected fs

[root-odJJhXpcy38dnm+]

Revision: 2811
Author: tv
Date: 2012-01-25 19:30:33 +0100 (Wed, 25 Jan 2012)
Log Message:
-----------
only consider fstab from the selected fs

Modified Paths:
--------------
drakx/trunk/rescue/NEWS
drakx/trunk/rescue/guessmounts

Modified: drakx/trunk/rescue/NEWS
===================================================================
--- drakx/trunk/rescue/NEWS 2012-01-25 18:30:29 UTC (rev 2810)
+++ drakx/trunk/rescue/NEWS 2012-01-25 18:30:33 UTC (rev 2811)
@@ -3,6 +3,7 @@
- fix mounting / on LV
- fix mounting / on soft RAID or crypted LV (mga#3778 & mga#448)
- include xz for xz modules
+- only consider fstab from the selected fs
- switch to udev

Version 1.28 - 15 January 2011, by Thierry Vignaud

Modified: drakx/trunk/rescue/guessmounts
===================================================================
--- drakx/trunk/rescue/guessmounts 2012-01-25 18:30:29 UTC (rev 2810)
+++ drakx/trunk/rescue/guessmounts 2012-01-25 18:30:33 UTC (rev 2811)
@@ -67,8 +67,8 @@
if (my $release_file = common::release_file($target)) {
my $release = chomp_(cat_("$target$release_file"));
print STDERR "=> found a $release root partition on $dev\n=> type $fs, version `\n";
- @fstab = fs::read_fstab($target, '/etc/fstab');
- push @roots, { dev => $dev, release => $release, fs => $fs };
+ my @fstab = fs::read_fstab($target, '/etc/fstab');
+ push @roots, { dev => $dev, release => $release, fs => $fs, fstab => \@fstab };
}
system('umount', $target) == 0 or die "error unmounting $target\n";
}
@@ -79,6 +79,7 @@
my $selected = first(@roots);
$root = $selected->{dev};
$fs = $selected->{fs};
+ @fstab = @{$selected->{fstab}};
print STDERR "=> Selecting $root as root fs\n";
}