diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-03-03 22:26:49 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-03-03 22:26:49 +0000 |
| commit | 120ce4913ae2f6816f7338eb2f521e49aa9ae662 (patch) | |
| tree | 10585e48287c7fd4456cd99bc720bcb30aa3e192 /perl-install | |
| parent | 5e741c923710a430fdecf9d1485b30ef920de9c8 (diff) | |
| download | drakx-backup-do-not-use-120ce4913ae2f6816f7338eb2f521e49aa9ae662.tar drakx-backup-do-not-use-120ce4913ae2f6816f7338eb2f521e49aa9ae662.tar.gz drakx-backup-do-not-use-120ce4913ae2f6816f7338eb2f521e49aa9ae662.tar.bz2 drakx-backup-do-not-use-120ce4913ae2f6816f7338eb2f521e49aa9ae662.tar.xz drakx-backup-do-not-use-120ce4913ae2f6816f7338eb2f521e49aa9ae662.zip | |
- use cdrom:// instead of removable:// in urpmi.cfg (urpmi 5.7)
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/media.pm | 15 |
2 files changed, 5 insertions, 11 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 70cd79c7a..388fd72fd 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -4,6 +4,7 @@ - do not propose to deselect media if none can be deselected - no more /media/cdrom in fstab by default (not needed anymore by urpmi) +- use cdrom:// instead of removable:// in urpmi.cfg (urpmi 5.7) - use and install ntfs-3g by default for ntfs partitions (#37823) Version 10.6.25 - 28 February 2008 diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm index c9ff9cfe0..f5974ee79 100644 --- a/perl-install/install/media.pm +++ b/perl-install/install/media.pm @@ -946,19 +946,12 @@ sub install_urpmi { my ($dir, $removable_device, $static); my $phys_m = $medium->{phys_medium}; - if ($phys_m->{method} eq 'ftp' || $phys_m->{method} eq 'http') { + if ($phys_m->{method} eq 'ftp' || $phys_m->{method} eq 'http' || $phys_m->{method} eq 'cdrom') { $dir = $phys_m->{url}; - } else { - #- for cdrom, removable://... is best since it mounts *and* umounts cdrom - #- for iso files, removable://... doesn't work correctly - my $urpmi_method = $phys_m->{method} eq 'cdrom' ? 'removable' : 'file'; + } elsif ($phys_m->{method} eq 'iso') { + my $urpmi_method = 'file'; $dir = "$urpmi_method:/$phys_m->{mntpoint}$phys_m->{rel_path}"; - if ($phys_m->{method} eq 'iso') { - $removable_device = $phys_m->{loopback_device}{mntpoint} . $phys_m->{loopback_file}; - } elsif ($phys_m->{method} eq 'cdrom') { - $removable_device = devices::make($phys_m->{device}); - $static = 1; - } + $removable_device = $phys_m->{loopback_device}{mntpoint} . $phys_m->{loopback_file}; } $dir = MDK::Common::File::concat_symlink($dir, $medium->{rpmsdir}); |