diff options
| -rw-r--r-- | client_wizard/client.wiz | 1 | ||||
| -rw-r--r-- | db_wizard/db.wiz | 1 | ||||
| -rw-r--r-- | dhcp_wizard/dhcp.wiz | 9 | ||||
| -rw-r--r-- | dns_wizard/dns.wiz | 1 | ||||
| -rw-r--r-- | firewall_wizard/firewall.wiz | 1 | ||||
| -rw-r--r-- | ftp_wizard/ftp.wiz | 12 | ||||
| -rw-r--r-- | news_wizard/news.wiz | 1 | ||||
| -rw-r--r-- | proxy_wizard/proxy.wiz | 1 | ||||
| -rw-r--r-- | samba_wizard/samba.wiz | 3 | ||||
| -rw-r--r-- | time_wizard/time.wiz | 1 |
10 files changed, 17 insertions, 14 deletions
diff --git a/client_wizard/client.wiz b/client_wizard/client.wiz index 52b9e133..665f04b3 100644 --- a/client_wizard/client.wiz +++ b/client_wizard/client.wiz @@ -25,7 +25,6 @@ <Page helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz.html" name="Welcome" - jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net" executionLevel="NORMAL" nextFinish="false" canBack="true" diff --git a/db_wizard/db.wiz b/db_wizard/db.wiz index 8fff8105..867bdede 100644 --- a/db_wizard/db.wiz +++ b/db_wizard/db.wiz @@ -34,7 +34,6 @@ <Page name="welcome" - jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net" executionLevel="NORMAL" nextFinish="false" canBack="true" diff --git a/dhcp_wizard/dhcp.wiz b/dhcp_wizard/dhcp.wiz index f253fc86..e02657ae 100644 --- a/dhcp_wizard/dhcp.wiz +++ b/dhcp_wizard/dhcp.wiz @@ -30,7 +30,6 @@ <Page helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-dhcp.html" name="welcome" - jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net" executionLevel="NORMAL" nextFinish="false" canBack="true" @@ -76,7 +75,7 @@ helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-dhcp.html" name="ask_dhcp_ip_range" comment="Ask the dhcp ip range" - jumpScript="__WIZ_HOME__/dhcp_wizard/check_range.sh" + jumpScript="__WIZ_HOME__/dhcp_wizard/scripts/check_range.sh" executionLevel="NORMAL" nextFinish="false" canBack="true" @@ -110,7 +109,7 @@ <Freetext name="dhcpIpLow" variableName="dhcp_range_low" - fillScript="__WIZ_HOME__/dhcp_wizard/compute_range1.sh" + fillScript="__WIZ_HOME__/dhcp_wizard/scripts/compute_range1.sh" helpText="Lowest IP Address:" editable="true" > @@ -119,7 +118,7 @@ <Freetext name="dhcpIpHigh" variableName="dhcp_range_high" - fillScript="__WIZ_HOME__/dhcp_wizard/compute_range2.sh" + fillScript="__WIZ_HOME__/dhcp_wizard/scripts/compute_range2.sh" helpText="Highest IP Address:" editable="true" > @@ -152,7 +151,7 @@ <Page helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-dhcp.html" name="doit" - jumpScript="__WIZ_HOME__/dhcp_wizard/do_it_dhcp.sh" + func="do_it" nextButtonText="Configure" executionLevel="NORMAL" nextFinish="false" diff --git a/dns_wizard/dns.wiz b/dns_wizard/dns.wiz index 945efe91..2c46b655 100644 --- a/dns_wizard/dns.wiz +++ b/dns_wizard/dns.wiz @@ -27,7 +27,6 @@ <Page name="Welcome" helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-dns.html" - jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net" executionLevel="NORMAL" nextFinish="false" canBack="true" diff --git a/firewall_wizard/firewall.wiz b/firewall_wizard/firewall.wiz index 1906b997..4caca9e8 100644 --- a/firewall_wizard/firewall.wiz +++ b/firewall_wizard/firewall.wiz @@ -29,7 +29,6 @@ <Page helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-firewall.html" name="Welcome" - jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net" executionLevel="NORMAL" nextFinish="false" canBack="true" diff --git a/ftp_wizard/ftp.wiz b/ftp_wizard/ftp.wiz index 113c2518..f8b1c8cc 100644 --- a/ftp_wizard/ftp.wiz +++ b/ftp_wizard/ftp.wiz @@ -23,6 +23,16 @@ > </Variable> + <Variable + name="wiz_ftp_anon" + shellVariable="wiz_ftp_external" + > + </Variable> + <Variable + name="wiz_ftp_home" + shellVariable="wiz_ftp_external" + > + </Variable> <Page helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-ftp.html" name="welcome" @@ -137,7 +147,7 @@ variableName="wiz_ftp_external" forceEnabled="1" forceDisabled="0" - helpText="Enable the FTP Server for the Intranet and for the Internet" + helpText="Enable the FTP Server for the Internet" > </Boolean> diff --git a/news_wizard/news.wiz b/news_wizard/news.wiz index c3f57c20..8fa0f668 100644 --- a/news_wizard/news.wiz +++ b/news_wizard/news.wiz @@ -31,7 +31,6 @@ <Page name="Welcome" helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-news.html" - jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net" executionLevel="NORMAL" nextFinish="false" canBack="true" diff --git a/proxy_wizard/proxy.wiz b/proxy_wizard/proxy.wiz index cd264303..367475e4 100644 --- a/proxy_wizard/proxy.wiz +++ b/proxy_wizard/proxy.wiz @@ -86,7 +86,6 @@ <Page name="Welcome" helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html" - jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net" executionLevel="NORMAL" nextFinish="false" canBack="true" diff --git a/samba_wizard/samba.wiz b/samba_wizard/samba.wiz index e2f6983e..e5273ad3 100644 --- a/samba_wizard/samba.wiz +++ b/samba_wizard/samba.wiz @@ -47,7 +47,6 @@ <Page helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html" name="Welcome" - jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net" executionLevel="NORMAL" nextFinish="false" canBack="true" @@ -209,6 +208,7 @@ variableName="workgroup" helpText="Workgroup:" editable="true" + fillfunc="get_workgroup" > </Freetext> </Page> @@ -269,6 +269,7 @@ variableName="banner" helpText="Banner:" editable="true" + fillfunc="get_banner" > </Freetext> </Page> diff --git a/time_wizard/time.wiz b/time_wizard/time.wiz index 3bb66485..1bee88ef 100644 --- a/time_wizard/time.wiz +++ b/time_wizard/time.wiz @@ -61,7 +61,6 @@ <Page helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-time.html" name="welcome" - jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net" executionLevel="NORMAL" nextFinish="false" canBack="true" |