From 755405c9fec21068bd64b2ee82e89217ab590715 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 7 Nov 2000 17:38:07 +0000 Subject: (afterInstallPackages): give medium 'cdrom' to install_urpmi in case of $::oem --- perl-install/install_steps.pm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'perl-install') 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) }; -- cgit v1.2.1