From 6ace92b35adc92d0642bba9a987b853694cd3b16 Mon Sep 17 00:00:00 2001
From: Antoine Ginies <aginies@mandriva.com>
Date: Tue, 20 Jan 2004 17:50:51 +0000
Subject: - fix typo in waiting screen - fix pb of nisdomainname check

---
 nisautofs_wizard/Nisautofs.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'nisautofs_wizard')

diff --git a/nisautofs_wizard/Nisautofs.pm b/nisautofs_wizard/Nisautofs.pm
index d18080bf..7d9b1fc9 100644
--- a/nisautofs_wizard/Nisautofs.pm
+++ b/nisautofs_wizard/Nisautofs.pm
@@ -67,13 +67,13 @@ my $o = {
 	};
 
 my %level = (
-             1 => N("Nis Server - Setup configuration NIS + Autofs(nfs) server"),
-             2 => N("Nis Client - Setup a Nis Client"),
+             1 => N("NIS Server with autofs map"),
+             2 => N("NIS Client"),
              );
 
 $o->{pages} = {
 	       welcome => {
-			   name => N("NIS server with autofs map") . "\n\n" . N('Setup a Nis server with autofs map (auto.home and auto.master files).") . "\n\n" . N("Client can automatically mount their home directory when they log on a NIS client computer network.'),
+			   name => N("NIS server with autofs map") . "\n\n" . N("Setup a Nis server with autofs map, auto.home and auto.master files.") . "\n\n" . N("Client can automatically mount their home directory when they log on a NIS client computer network."),
 			   no_back => 1,
 			   pre => sub { $o->{var}{wiz_level} ||= 1; },
 			   post => sub { if ($o->{var}{wiz_level} == 2) {
@@ -291,16 +291,16 @@ sub update_nsswitch {
 
 sub uninstall_rpm {
     my ($rpm) = @_;
-    system("urpme $rpm") if (system('/bin/rpm', '>/dev/null', '-q', $rpm));  
+    system("urpme $rpm --auto");# if (system('/bin/rpm', '>/dev/null', '-q', $rpm));
 }
 
 sub do_it_server {
     return if $::testing;
     my $in = 'interactive'->vnew('su', 'nisautofsconfig');
-    my $w = $in->wait_message(N("Nis+autofs Server"), N("Configuring your system as a Nis+Autofs(nfs) server ..."));
+    my $w = $in->wait_message(N("NIS with autofs map"), N("Configuring your system to be a NIS server with Autofs map..."));
 #    system("urpme --auto autofs") if (system("/bin/rpm -q autofs >/dev/null"));
     uninstall_rpm('autofs');
-    system("urpmi --auto-select ypserv");
+    system("urpmi --auto --auto-select ypserv");
     needed_service('ypserv');
     # configure autofs to fit nis
     configure_auto();
-- 
cgit v1.2.1