From a6a5c10af0b2eae5cabda80764ab164b28f2a207 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Wed, 25 Jan 2012 18:30:33 +0000
Subject: only consider fstab from the selected fs

---
 rescue/NEWS        | 1 +
 rescue/guessmounts | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'rescue')

diff --git a/rescue/NEWS b/rescue/NEWS
index 990543df2..00af064b4 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -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
diff --git a/rescue/guessmounts b/rescue/guessmounts
index 10faa161a..3d508f1df 100755
--- a/rescue/guessmounts
+++ b/rescue/guessmounts
@@ -67,8 +67,8 @@ foreach (@$normal_parts) {
     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 @@ if (@roots) {
     my $selected = first(@roots);
     $root = $selected->{dev};
     $fs = $selected->{fs};
+    @fstab = @{$selected->{fstab}};
     print STDERR "=> Selecting $root as root fs\n";
 }
 
-- 
cgit v1.2.1