summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-04-14 08:58:32 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-04-14 08:58:32 +0000
commit1be3827ddb8fdd6eda368789a52fbb09f858ef29 (patch)
tree5c03cc59ec007b62636f522b1e6332da1d982c0c
parent131548683ada815387adaac012d63b9cda1ec13f (diff)
downloaddrakx-1be3827ddb8fdd6eda368789a52fbb09f858ef29.tar
drakx-1be3827ddb8fdd6eda368789a52fbb09f858ef29.tar.gz
drakx-1be3827ddb8fdd6eda368789a52fbb09f858ef29.tar.bz2
drakx-1be3827ddb8fdd6eda368789a52fbb09f858ef29.tar.xz
drakx-1be3827ddb8fdd6eda368789a52fbb09f858ef29.zip
- fix "Mounting other partitions from fstab" which use UUID=xxx
-rw-r--r--rescue/NEWS2
-rwxr-xr-xrescue/guessmounts5
2 files changed, 5 insertions, 2 deletions
diff --git a/rescue/NEWS b/rescue/NEWS
index 901aa9016..9b62815f5 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -1,3 +1,5 @@
+- fix "Mounting other partitions from fstab" which use UUID=xxx
+
Version 1.9 - 10 March 2008, by Olivier "blino" Blin
- handle ntfs-3g in fstab
diff --git a/rescue/guessmounts b/rescue/guessmounts
index fbbfa2812..c755e0743 100755
--- a/rescue/guessmounts
+++ b/rescue/guessmounts
@@ -84,9 +84,10 @@ if ($root) {
fs::mount_options::pack($_, $valued_options, $options); #- vfat opts, we don't have the modules in rescue
my $where = "$target$_->{mntpoint}";
+ my $dev = fs::wild_device::from_part('', $_);
mkdir_p($where);
- print STDERR "\t$_->{device} on $where type $_->{fs_type} options $_->{options}\n";
- system("mount -t $_->{fs_type} /dev/$_->{device} $where -o $_->{options}");
+ print STDERR "\t$dev on $where type $_->{fs_type} options $_->{options}\n";
+ system("mount -t $_->{fs_type} $dev $where -o $_->{options}");
system("cp -f /etc/mtab $target/etc/mtab"); #- to allow a nice chrooted "mount" or "df"
}
print STDERR "\nYour system is ready on $target.\n\n";