summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--time_wizard/scripts/NTPConf.pm12
-rw-r--r--time_wizard/time.wiz15
2 files changed, 18 insertions, 9 deletions
diff --git a/time_wizard/scripts/NTPConf.pm b/time_wizard/scripts/NTPConf.pm
index effa87d6..77a5576c 100644
--- a/time_wizard/scripts/NTPConf.pm
+++ b/time_wizard/scripts/NTPConf.pm
@@ -33,13 +33,21 @@ sub chooser {
2;
}
+sub chooser4 {
+ if ($ENV{chooser4} eq "save_quit") {
+ do_it();
+ return 1;
+ }
+ 2;
+}
+
sub test {
system("/usr/sbin/ntpdate -q $ENV{server1} $ENV{server2}");
if (!($? >> 8)) {
do_it();
- return 2;
+ return 1;
}
- return 1;
+ 2;
}
sub do_it {
diff --git a/time_wizard/time.wiz b/time_wizard/time.wiz
index 14f497be..889e0b29 100644
--- a/time_wizard/time.wiz
+++ b/time_wizard/time.wiz
@@ -561,13 +561,13 @@
<Target
targetName="server_not_responding"
- jumpIndex="1"
+ jumpIndex="2"
>
</Target>
<Target
targetName="ciao"
- jumpIndex="2"
+ jumpIndex="1"
>
</Target>
@@ -617,21 +617,22 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-time.html"
name="server_not_responding"
- func="test"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
canCancel="true"
+ func="chooser4"
>
+
<Target
- targetName="server_not_responding"
+ targetName="ciao"
jumpIndex="1"
>
</Target>
<Target
- targetName="ciao"
+ targetName="test_server"
jumpIndex="2"
>
</Target>
@@ -677,13 +678,13 @@
>
<Option
- value="tryagain"
+ value="try_again"
description="Try again"
>
</Option>
<Option
- value="savewithouttest"
+ value="save_quit"
description="Save config without test"
>
</Option>