diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-11-07 17:38:07 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-11-07 17:38:07 +0000 |
| commit | 755405c9fec21068bd64b2ee82e89217ab590715 (patch) | |
| tree | 3b32ed10f28d99be0d71917ebce39c2dd3522f83 | |
| parent | 246b337f95f3e0edc21d31b4b6a1d826d0a120cc (diff) | |
| download | drakx-755405c9fec21068bd64b2ee82e89217ab590715.tar drakx-755405c9fec21068bd64b2ee82e89217ab590715.tar.gz drakx-755405c9fec21068bd64b2ee82e89217ab590715.tar.bz2 drakx-755405c9fec21068bd64b2ee82e89217ab590715.tar.xz drakx-755405c9fec21068bd64b2ee82e89217ab590715.zip | |
(afterInstallPackages): give medium 'cdrom' to install_urpmi in case of $::oem
| -rw-r--r-- | perl-install/install_steps.pm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 65b8c7086..a4a8062ae 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -442,11 +442,9 @@ Consoles 1,3,4,7 may also contain interesting information"; my $pkg = pkgs::packageByName($o->{packages}, 'urpmi'); if ($pkg && pkgs::packageFlagSelected($pkg)) { - install_any::install_urpmi($o->{prefix}, $o->{method}, $o->{packages}[2]); -#- asked by jloup to disable urpmi for security level < 2, as it is managed a whole for -#- security <= 2 by msec on "/usr/share/msec/grpuser.sh --refresh", it has been accepted to -#- simply disable it :-( -# substInFile { s/^urpmi\n//; $_ .= "urpmi\n" if eof } "$msec/group.conf" if -d $msec; + install_any::install_urpmi($o->{prefix}, + $::oem ? 'cdrom' : $o->{method}, #- HACK + $o->{packages}[2]); } if (my $charset = lang::charset($o->{lang}, $o->{prefix})) { eval { update_userkderc("$o->{prefix}/usr/share/config/kdeglobals", 'Locale', Charset => $charset) }; |