diff options
| author | Antoine Ginies <aginies@mandriva.com> | 2004-12-10 14:27:10 +0000 |
|---|---|---|
| committer | Antoine Ginies <aginies@mandriva.com> | 2004-12-10 14:27:10 +0000 |
| commit | b9ec6722b17182f48739b79dbe169f9ee21e4e07 (patch) | |
| tree | 41285cce2b7f929f4cfd6f7a565cd13af8720e31 | |
| parent | 8ba9e581ab914bcf54e075a21ecef89805c68036 (diff) | |
| download | drakwizard-b9ec6722b17182f48739b79dbe169f9ee21e4e07.tar drakwizard-b9ec6722b17182f48739b79dbe169f9ee21e4e07.tar.gz drakwizard-b9ec6722b17182f48739b79dbe169f9ee21e4e07.tar.bz2 drakwizard-b9ec6722b17182f48739b79dbe169f9ee21e4e07.tar.xz drakwizard-b9ec6722b17182f48739b79dbe169f9ee21e4e07.zip | |
use test_host_domain and nisdomain
| -rw-r--r-- | nisautofs_wizard/Nisautofs.pm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/nisautofs_wizard/Nisautofs.pm b/nisautofs_wizard/Nisautofs.pm index e2142808..cda45780 100644 --- a/nisautofs_wizard/Nisautofs.pm +++ b/nisautofs_wizard/Nisautofs.pm @@ -23,7 +23,7 @@ package MDK::Wizard::Nisautofs; use lib qw(/usr/lib/libDrakX); use strict; -#use standalone; +#use standalone; use common; use services; #use MDK::Wizard::Varspaceval; @@ -34,7 +34,7 @@ use MDK::Wizard::Wizcommon; my $wiz = new MDK::Wizard::Wizcommon; #my $NISDOMAIN = $wiz->{net}->network_get("NISDOMAIN"); -my $NISDOMAIN = chomp_(`dnsdomainname`); +my $NISDOMAIN = chomp_(`nisdomainname`); my @HOST = split('\.', $wiz->{net}->network_get("HOSTNAME")); my $HOST = @HOST[0]; # just need basename and not full qualified computer hostname (with domainaname) my $NIS_DIRMAKEFILE = "/var/yp/"; @@ -60,10 +60,7 @@ my $o = { needed_rpm => [ 'ypbind', 'nfs-utils', 'yp-tools', 'nfs-utils-clients' ], defaultimage => "$ENV{__WIZ_HOME__}/nisautofs_wizard/images/nisautofs.png", init => sub { - if (member($NISDOMAIN, qw(localdomain (none)))) { - return 0, N("You need to readjust your NIS domainname. For a NIS server you need a correct NIS domainname, not equal to localdomain or none.") - } - 1 + test_host_domain($HOST, $NISDOMAIN); }, }; |