summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-04-14 08:58:55 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-04-14 08:58:55 +0000
commit4d706971a9b55bca8b7a9dee600a8b15c0958340 (patch)
treefb5e27f7b64f89ec6e9b9198cabc4dd622acc9d6
parentd8b338c82e68b4e17726aed60d191c400c96aa05 (diff)
downloaddrakx-backup-do-not-use-4d706971a9b55bca8b7a9dee600a8b15c0958340.tar
drakx-backup-do-not-use-4d706971a9b55bca8b7a9dee600a8b15c0958340.tar.gz
drakx-backup-do-not-use-4d706971a9b55bca8b7a9dee600a8b15c0958340.tar.bz2
drakx-backup-do-not-use-4d706971a9b55bca8b7a9dee600a8b15c0958340.tar.xz
drakx-backup-do-not-use-4d706971a9b55bca8b7a9dee600a8b15c0958340.zip
- fix "Mounting other partitions from fstab" which use UUID=xxx
(backport from HEAD)
-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";