diff options
| author | Antoine Ginies <aginies@mandriva.com> | 2004-07-29 00:54:51 +0000 |
|---|---|---|
| committer | Antoine Ginies <aginies@mandriva.com> | 2004-07-29 00:54:51 +0000 |
| commit | 31f34fba8022f2d8766641c84c5664b61631e127 (patch) | |
| tree | cc7c00543bc9c4a919ddad2a9e98fc0ad5ae57b1 | |
| parent | 63903b51160428fcec05ad183c2ed6ef10178b26 (diff) | |
| download | drakwizard-31f34fba8022f2d8766641c84c5664b61631e127.tar drakwizard-31f34fba8022f2d8766641c84c5664b61631e127.tar.gz drakwizard-31f34fba8022f2d8766641c84c5664b61631e127.tar.bz2 drakwizard-31f34fba8022f2d8766641c84c5664b61631e127.tar.xz drakwizard-31f34fba8022f2d8766641c84c5664b61631e127.zip | |
use dnsdomainname (thx jmdault)
| -rwxr-xr-x | kolab_wizard/Kolab.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kolab_wizard/Kolab.pm b/kolab_wizard/Kolab.pm index d4395dda..7fd82449 100755 --- a/kolab_wizard/Kolab.pm +++ b/kolab_wizard/Kolab.pm @@ -33,13 +33,13 @@ if (!$IPSERVER) { my $interface = 'eth0'; ($IPSERVER) = `/sbin/ip addr show dev $interface` =~ /^\s*inet\s+(\d+\.\d+\.\d+\.\d+)/m; } -my $DOMAINNAME = chomp_(`domainname`); +my $DOMAINNAME = chomp_(`dnsdomainname`); my $kolab_config = "/etc/kolab/kolab.conf"; my $o = { name => N("Kolab configuration wizard"), init => sub { - if (member($DOMAINNAME, qw(localdomain (none)))) { + if (($DOMAINNAME eq "") or ($HOSTNAME eq "localhost")) { return 0, N("You need to readjust your domainname, not equal to localdomain or none. Please launch drakconnect to adjust it.") } 1 |