diff options
| -rw-r--r-- | perl-install/ChangeLog | 3 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 13 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 79afc952f..50929b6f1 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,6 +1,9 @@ 2000-09-29 François Pons <fpons@mandrakesoft.com> * modules.pm (load): fixed when standalone, use modprobe. + * pkgs.pm: added preference for wu-ftpd. + * install_steps.pm: removed possibilty to add an user in urpmi + group (jloup). 2000-09-29 Guillaume Cottenceau <gc@mandrakesoft.com> diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 9e6511f43..c66394474 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -431,11 +431,14 @@ Consoles 1,3,4,7 may also contain interesting information"; substInFile { s/^cdrom\n//; $_ .= "cdrom\n" if eof } "$msec/group.conf" if -d $msec; substInFile { s/^cdwriter\n//; $_ .= "cdwriter\n" if eof } "$msec/group.conf" if -d $msec; - my $pkg = pkgs::packageByName($o->{packages}, 'urpmi'); - if ($pkg && pkgs::packageFlagSelected($pkg)) { - install_any::install_urpmi($o->{prefix}, $o->{method}, $o->{packages}[2]); - substInFile { s/^urpmi\n//; $_ .= "urpmi\n" if eof } "$msec/group.conf" if -d $msec; - } +#- 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 :-( +# my $pkg = pkgs::packageByName($o->{packages}, 'urpmi'); +# if ($pkg && pkgs::packageFlagSelected($pkg)) { +# install_any::install_urpmi($o->{prefix}, $o->{method}, $o->{packages}[2]); +# substInFile { s/^urpmi\n//; $_ .= "urpmi\n" if eof } "$msec/group.conf" if -d $msec; +# } # #- update language and icons for KDE. # update_userkderc($o->{prefix}, 'Locale', Language => ""); diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 59de3f42f..2324da0ab 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -87,7 +87,7 @@ hackkernel-pcmcia-cs hackkernel-smp hackkernel-smp-fb autoirpm autoirpm-icons numlock ); -@preferred = qw(perl-GTK postfix ghostscript-X vim-minimal kernel ispell-en); +@preferred = qw(perl-GTK postfix wu-ftpd ghostscript-X vim-minimal kernel ispell-en); #- constant for small transaction. $limitMinTrans = 8; |