summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-02-23 21:35:12 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-02-23 21:35:12 +0000
commit670c31d71670dfc8fd1fb8e815f3b292d4cb4cf9 (patch)
treead90e4d63c9ea65f9f33563457a712bf641adde2 /perl-install
parent2b8b0d8eed2f7acea593bf79a45b0dbd0fbf3443 (diff)
downloaddrakx-backup-do-not-use-670c31d71670dfc8fd1fb8e815f3b292d4cb4cf9.tar
drakx-backup-do-not-use-670c31d71670dfc8fd1fb8e815f3b292d4cb4cf9.tar.gz
drakx-backup-do-not-use-670c31d71670dfc8fd1fb8e815f3b292d4cb4cf9.tar.bz2
drakx-backup-do-not-use-670c31d71670dfc8fd1fb8e815f3b292d4cb4cf9.tar.xz
drakx-backup-do-not-use-670c31d71670dfc8fd1fb8e815f3b292d4cb4cf9.zip
(afterInstallPackages): no kdm UserView in NIS
(configurePrinter): if_'ization
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_steps.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 5dcb26d7d..c2dd27108 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -440,7 +440,7 @@ Consoles 1,3,4,7 may also contain interesting information";
my $welcome = _("Welcome to %s", "HOSTNAME");
substInFile { s/^(GreetString)=.*/$1=$welcome/ } "$o->{prefix}/usr/share/config/kdmrc";
- substInFile { s/^(UserView)=true/$1=false/ } "$o->{prefix}/usr/share/config/kdmrc" if $o->{security} >= 3;
+ substInFile { s/^(UserView)=true/$1=false/ } "$o->{prefix}/usr/share/config/kdmrc" if $o->{security} >= 3 || $o->{authentication}{NIS};
run_program::rooted($o->{prefix}, "kdeDesktopCleanup");
#- konsole and gnome-terminal are lamers in exotic languages, link them to something better
@@ -534,7 +534,7 @@ sub configurePrinter {
}
#- if at least one queue is configured, configure it.
if ($use_cups || $use_lpr) {
- $o->pkg_install(($use_cups ? ('cups-drivers') : ()), ($use_lpr ? ('rhs-printfilters') : ()));
+ $o->pkg_install(if_($use_cups, 'cups-drivers'), if_($use_lpr, 'rhs-printfilters'));
require printer;
eval { add2hash($o->{printer}, printer::getinfo($o->{prefix})) }; #- get existing configuration.