summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-04-04 17:39:10 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-04-04 17:39:10 +0000
commitadd6d3c510e4efb7b1f41615ccb6a19a3c3b5c3e (patch)
treee5ae966de8603c98a127e8cfd76f410ef4b8706b
parentd465869b2fb2a9a6ad80f354ebf01a2b91d5622a (diff)
downloaddrakx-add6d3c510e4efb7b1f41615ccb6a19a3c3b5c3e.tar
drakx-add6d3c510e4efb7b1f41615ccb6a19a3c3b5c3e.tar.gz
drakx-add6d3c510e4efb7b1f41615ccb6a19a3c3b5c3e.tar.bz2
drakx-add6d3c510e4efb7b1f41615ccb6a19a3c3b5c3e.tar.xz
drakx-add6d3c510e4efb7b1f41615ccb6a19a3c3b5c3e.zip
Try to guess the device associated with the CD-ROM when installing urpmi
(bug 14395)
-rw-r--r--perl-install/install_any.pm2
1 files changed, 2 insertions, 0 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index b762b8f4f..5bf917ded 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -1003,6 +1003,8 @@ sub install_urpmi {
$removable_device = ($p->{mntpoint} || "/mnt/hd") . "/$iso_path";
} elsif ($curmethod eq 'cdrom') {
$removable_device = '/dev/cdrom';
+ my $p; $p = fs::get::mntpoint2part("/tmp/image", $::o->{fstab})
+ and $removable_device = $p->{device};
}
#- build a list file if needed.