Timectrl geschrieben.

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / time.cgi

diff --git a/html/cgi-bin/time.cgi b/html/cgi-bin/time.cgi
index 9b599453b583daf6d5a2e1ee4c0265a450a17765..689f988c81bead7ec087933eb35a934a8a047124 100644 (file)
--- a/html/cgi-bin/time.cgi
+++ b/html/cgi-bin/time.cgi
@@ -123,7 +123,8 @@ ERROR:
 
        if ($timesettings{'ENABLENTP'} eq 'on' && $timesettings{'VALID'} eq 'yes')
        {
-               system ('/bin/touch', "${General::swroot}/time/enable");
+               system ('/usr/bin/touch', "${General::swroot}/time/enable");
+               system ('/usr/local/bin/timectrl enable >/dev/null 2>&1');
                &General::log($Lang::tr{'ntp syncro enabled'});
                unlink "${General::swroot}/time/counter";
                if ($timesettings{'UPDATE_METHOD'} eq 'periodically')
@@ -135,7 +136,7 @@ ERROR:
                }
                if ($timesettings{'ENABLECLNTP'} eq 'on') # DPC added to 1.3.1
                {
-                       system ('/bin/touch', "${General::swroot}/time/allowclients"); # DPC added to 1.3.1
+                       system ('/usr/bin/touch', "${General::swroot}/time/allowclients"); # DPC added to 1.3.1
                        &General::log($Lang::tr{'ntpd restarted'}); # DPC added to 1.3.1
                } else {
                        unlink "${General::swroot}/time/allowclients";
@@ -147,10 +148,11 @@ ERROR:
                unlink "${General::swroot}/time/enable";
                unlink "${General::swroot}/time/settimenow";
                unlink "${General::swroot}/time/allowclients"; # DPC added to 1.3.1
+               system ('/usr/local/bin/timectrl disable >/dev/null 2>&1');
                &General::log($Lang::tr{'ntp syncro disabled'})
        }
        if (! $errormessage) {
-               system ('/usr/local/bin/restartntpd'); # DPC added to 1.3.1
+               system ('/usr/local/bin/timectrl restart >/dev/null 2>&1'); # DPC added to 1.3.1
        }
 }
 
@@ -159,8 +161,8 @@ ERROR:
 $timesettings{'ACTION'} = &Header::cleanhtml ($timesettings{'ACTION'});
 if ($timesettings{'ACTION'} eq $Lang::tr{'set time now'} && $timesettings{'ENABLENTP'} eq 'on')
 {
-       system ('/bin/touch', "${General::swroot}/time/settimenow");
-       system ('/usr/local/bin/timecheckctrl >& /dev/null');
+       system ('/usr/bin/touch', "${General::swroot}/time/settimenow");
+       system ('/usr/local/bin/timecheck >& /dev/null');
 }
 
 &General::readhash("${General::swroot}/time/settings", \%timesettings);