diff options
| author | Arnaud Desmons <adesmons@mandriva.com> | 2002-09-19 10:09:26 +0000 |
|---|---|---|
| committer | Arnaud Desmons <adesmons@mandriva.com> | 2002-09-19 10:09:26 +0000 |
| commit | 824b458a2526ed8b2e6628a77fd21510e7dc7d4e (patch) | |
| tree | a9968be7a59d64832f9073186651275c5296187f | |
| parent | 9838584ce378e5a02d604d8431632f4464fd4e5c (diff) | |
| download | drakwizard-824b458a2526ed8b2e6628a77fd21510e7dc7d4e.tar drakwizard-824b458a2526ed8b2e6628a77fd21510e7dc7d4e.tar.gz drakwizard-824b458a2526ed8b2e6628a77fd21510e7dc7d4e.tar.bz2 drakwizard-824b458a2526ed8b2e6628a77fd21510e7dc7d4e.tar.xz drakwizard-824b458a2526ed8b2e6628a77fd21510e7dc7d4e.zip | |
added dhcp check
| -rw-r--r-- | client_wizard/client.wiz | 26 | ||||
| -rw-r--r-- | client_wizard/scripts/Clientconf.pm | 9 |
2 files changed, 28 insertions, 7 deletions
diff --git a/client_wizard/client.wiz b/client_wizard/client.wiz index 13611bc3..65475c8d 100644 --- a/client_wizard/client.wiz +++ b/client_wizard/client.wiz @@ -3,11 +3,11 @@ <Wizard name="general" - libScript="__WIZ_HOME__/common/scripts/functions.sh" + libScript="/home/logarno/soft/wizard_perl/test/common/scripts/functions.sh" wizardTitle="DNS Wizard (add client)" imagePosition="top" - defaultImage="__WIZ_HOME__/client_wizard/images/DNS" - perlModule="__WIZ_HOME__/client_wizard/scripts/Clientconf.pm" + defaultImage="/home/logarno/soft/wizard_perl/test/client_wizard/images/DNS" + perlModule="/home/logarno/soft/wizard_perl/test/client_wizard/scripts/Clientconf.pm" rpm="bind" > @@ -30,6 +30,7 @@ nextFinish="false" canBack="true" canCancel="true" + func="check" > <Target @@ -45,7 +46,7 @@ </Target> <Target - targetName="error_need_net" + targetName="error_dhcp" jumpIndex="2" > </Target> @@ -77,6 +78,21 @@ > </Info> </Page> + <Page + helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-web.html" + name="error_dhcp" + jumpPage="CLIENT" + executionLevel="NORMAL" + nextFinish="false" + canBack="true" + canCancel="true" + > + + <Info + helpText="Warning\nYou are in dhcp, server may not work with your configuration." + > + </Info> + </Page> <Page helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz.html" @@ -195,7 +211,7 @@ <Page helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz.html" name="error_need_net" - subWizard="__WIZ_HOME__/server_wizard/server.wiz" + subWizard="/home/logarno/soft/wizard_perl/test/server_wizard/server.wiz" executionLevel="NORMAL" nextFinish="false" canBack="false" diff --git a/client_wizard/scripts/Clientconf.pm b/client_wizard/scripts/Clientconf.pm index 44a72482..f2454dba 100644 --- a/client_wizard/scripts/Clientconf.pm +++ b/client_wizard/scripts/Clientconf.pm @@ -1,8 +1,8 @@ #!/usr/bin/perl package Clientconf; -require "__WIZ_HOME__/common/scripts/Vareqval.pm"; -require "__WIZ_HOME__/common/scripts/DrakconnectConf.pm"; +require "/home/logarno/soft/wizard_perl/test/common/scripts/Vareqval.pm"; +require "/home/logarno/soft/wizard_perl/test/common/scripts/DrakconnectConf.pm"; use MDK::Common; use strict; use standalone; @@ -19,6 +19,11 @@ sub ip { $wiz_ip_server; } +sub check { + $> and return 1; + $o->is_dhcp() and return 2; + 0; +} sub up_serial { my ($file) = @_; |