diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-01-25 18:30:33 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-01-25 18:30:33 +0000 |
| commit | a6a5c10af0b2eae5cabda80764ab164b28f2a207 (patch) | |
| tree | be9622968766148c226c57cc29e135991d95b988 /rescue | |
| parent | 30f3dffc00bdc1582c74b8882c14e1b5c1260e55 (diff) | |
| download | drakx-a6a5c10af0b2eae5cabda80764ab164b28f2a207.tar drakx-a6a5c10af0b2eae5cabda80764ab164b28f2a207.tar.gz drakx-a6a5c10af0b2eae5cabda80764ab164b28f2a207.tar.bz2 drakx-a6a5c10af0b2eae5cabda80764ab164b28f2a207.tar.xz drakx-a6a5c10af0b2eae5cabda80764ab164b28f2a207.zip | |
only consider fstab from the selected fs
Diffstat (limited to 'rescue')
| -rw-r--r-- | rescue/NEWS | 1 | ||||
| -rwxr-xr-x | rescue/guessmounts | 5 |
2 files changed, 4 insertions, 2 deletions
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"; } |