summaryrefslogtreecommitdiffstats
path: root/dhcp_wizard
diff options
context:
space:
mode:
Diffstat (limited to 'dhcp_wizard')
-rw-r--r--dhcp_wizard/dhcp.wiz28
-rw-r--r--dhcp_wizard/scripts/Dhcpconf.pm5
2 files changed, 33 insertions, 0 deletions
diff --git a/dhcp_wizard/dhcp.wiz b/dhcp_wizard/dhcp.wiz
index 004430fd..a10afeaa 100644
--- a/dhcp_wizard/dhcp.wiz
+++ b/dhcp_wizard/dhcp.wiz
@@ -30,11 +30,24 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-dhcp.html"
name="welcome"
+ func="check_dhcp"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
canCancel="true"
>
+ <Target
+ targetName="ask_dhcp_ip_range"
+ jumpIndex="0"
+ >
+ </Target>
+
+ <Target
+ targetName="error_dhcp"
+ jumpIndex="1"
+ >
+ </Target>
+
<Info
helpText="DHCP Configuration Wizard"
>
@@ -111,6 +124,21 @@
>
</Info>
</Page>
+ <Page
+ helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-web.html"
+ name="error_dhcp"
+ jumpPage="ask_dhcp_ip_range"
+ 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-dhcp.html"
diff --git a/dhcp_wizard/scripts/Dhcpconf.pm b/dhcp_wizard/scripts/Dhcpconf.pm
index 5b31a53d..f16118de 100644
--- a/dhcp_wizard/scripts/Dhcpconf.pm
+++ b/dhcp_wizard/scripts/Dhcpconf.pm
@@ -51,6 +51,11 @@ sub check {
10;
}
+sub check_dhcp {
+ $o->is_dhcp() and return 1;
+ 0;
+}
+
sub do_it {
my $wiz_domain_name = $o->get("DomainName");
my $wiz_host_name = $o->get("SystemName");