Change npd to use tmpfs for its working files

diff --git a/html/cgi-bin/time.cgi b/html/cgi-bin/time.cgi
index 29bfd2f26ceab09d7cf0ef71d18239edc7caffbc..988a1484cc10fdb6a77180b120d55bf4c9cda6e1 100644 (file)
--- a/html/cgi-bin/time.cgi
+++ b/html/cgi-bin/time.cgi
@@ -127,10 +127,10 @@ ERROR:
                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'});
                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";
+               unlink "/var/lock/time/counter";

                if ($timesettings{'UPDATE_METHOD'} eq 'periodically')
                {
                if ($timesettings{'UPDATE_METHOD'} eq 'periodically')
                {

-                       open(FILE, ">/${General::swroot}/time/counter") or die "Unable to write counter file";
+                       open(FILE, ">/var/lock/time/counter") or die "Unable to write counter file";

                        flock(FILE, 2);
                        print FILE "$updateperiod\n";
                        close FILE;
                        flock(FILE, 2);
                        print FILE "$updateperiod\n";
                        close FILE;


@@ -147,7 +147,7 @@ ERROR:
        else
        {
                unlink "${General::swroot}/time/enable";
        else
        {
                unlink "${General::swroot}/time/enable";

-               unlink "${General::swroot}/time/settimenow";
+               unlink "/var/lock/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'})
                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'})


@@ -162,7 +162,7 @@ ERROR:
 $timesettings{'ACTION'} = &Header::cleanhtml ($timesettings{'ACTION'});
 if ($timesettings{'ACTION'} eq $Lang::tr{'set time now'} && $timesettings{'ENABLENTP'} eq 'on')
 {
 $timesettings{'ACTION'} = &Header::cleanhtml ($timesettings{'ACTION'});
 if ($timesettings{'ACTION'} eq $Lang::tr{'set time now'} && $timesettings{'ENABLENTP'} eq 'on')
 {

-       system ('/usr/bin/touch', "${General::swroot}/time/settimenow");
+       system ('/usr/bin/touch', "/var/lock/time/settimenow");

 }
 
 &General::readhash("${General::swroot}/time/settings", \%timesettings);
 }
 
 &General::readhash("${General::swroot}/time/settings", \%timesettings);


@@ -210,7 +210,7 @@ $selected{'UPDATE_PERIOD'}{$timesettings{'UPDATE_PERIOD'}} = "selected='selected
 
 # added to v0.0.4 to refresh screen if syncro event queued 
 my $refresh = '';
 
 # added to v0.0.4 to refresh screen if syncro event queued 
 my $refresh = '';

-if ( -e "${General::swroot}/time/settimenow") {
+if ( -e "/var/lock/time/settimenow") {

        $refresh = "<meta http-equiv='refresh' content='60;' />";
 }
 
        $refresh = "<meta http-equiv='refresh' content='60;' />";
 }
 


@@ -240,10 +240,12 @@ print <<END
 END
 ;
 
 END
 ;
 

-if ( -e "${General::swroot}/time/lastset")
+if ( -e "/var/lock/time/lastset")

 {
        print "$Lang::tr{'clock last synchronized at'}\n";
 {
        print "$Lang::tr{'clock last synchronized at'}\n";

-       my $output = `cat ${General::swroot}/time/lastset`;
+       open(FILE, "</var/lock/time/lastset") or die "Unable to read lastset";
+       my $output = <FILE>;
+       close FILE;

        print $output;
 }
 else
        print $output;
 }
 else


@@ -292,7 +294,7 @@ print <<END
 END
 ;
 
 END
 ;
 

-if ( -e "${General::swroot}/time/settimenow") {
+if ( -e "/var/lock/time/settimenow") {

        print "<tr>\n<td align='center'><img src='/images/clock.gif' alt='' /></td>\n";
        print "<td colspan='2'><font color='red'>$Lang::tr{'waiting to synchronize clock'}...</font></td></tr>\n";
 }
        print "<tr>\n<td align='center'><img src='/images/clock.gif' alt='' /></td>\n";
        print "<td colspan='2'><font color='red'>$Lang::tr{'waiting to synchronize clock'}...</font></td></tr>\n";
 }

diff --git a/src/initscripts/init.d/tmpfs b/src/initscripts/init.d/tmpfs
index fc45db231487e9dc0c7605dd7dbebc81d23ce8f9..41d6a1df96e7af51eab316c53f03963e9b23ad05 100644 (file)
--- a/src/initscripts/init.d/tmpfs
+++ b/src/initscripts/init.d/tmpfs
@@ -25,6 +25,10 @@ case "$1" in
                if [ ! -e /var/lock/subsys ]; then
                        mkdir -p /var/lock/subsys
                fi
                if [ ! -e /var/lock/subsys ]; then
                        mkdir -p /var/lock/subsys
                fi

+               if [ ! -e /var/lock/time ]; then
+                       mkdir -p /var/lock/time
+                       chown nobody.root /var/lock/time
+               fi

                if [ ! -e /var/run/clamav ]; then
                        mkdir -p /var/run/clamav
                        chown clamav:clamav /var/run/clamav
                if [ ! -e /var/run/clamav ]; then
                        mkdir -p /var/run/clamav
                        chown clamav:clamav /var/run/clamav

diff --git a/src/scripts/settime b/src/scripts/settime
index cede5f8c11009e9e85fc741d738731d05b00357d..0bfcf3edf606b4f3397dd5dc434cc19daee90868 100644 (file)
--- a/src/scripts/settime
+++ b/src/scripts/settime
@@ -44,18 +44,18 @@ if [ -n "$1" ]; then
 
                if [ "$ntpdatetest" -eq 0 ]; then
                        case $tlanguage in
 
                if [ "$ntpdatetest" -eq 0 ]; then
                        case $tlanguage in

-                               en ) date "+%X %Z on %d %B %Y" > /var/ipfire/time/lastset ;
+                               en ) date "+%X %Z on %d %B %Y" > /var/lock/time/lastset ;

                                        logger -t ipfire "NTP synchronisation event" ;;
                                        logger -t ipfire "NTP synchronisation event" ;;

-                               de ) date "+%X Uhr am %d.%m.%Y" > /var/ipfire/time/lastset ;
+                               de ) date "+%X Uhr am %d.%m.%Y" > /var/lock/time/lastset ;

                                        logger -t ipfire "NTP Synchronisierung" ;;
                                        logger -t ipfire "NTP Synchronisierung" ;;

-                               *  ) date "+%X %Z, %Y-%m-%d" > /var/ipfire/time/lastset ;
+                               *  ) date "+%X %Z, %Y-%m-%d" > /var/lock/time/lastset ;

                                        logger -t ipfire "NTP synchronisation" ;;
                        esac
 
                        /sbin/hwclock --systohc
                                        logger -t ipfire "NTP synchronisation" ;;
                        esac
 
                        /sbin/hwclock --systohc

-                       rm -f /var/ipfire/time/settimenow
+                       rm -f /var/lock/time/settimenow

                        # reset counter variable
                        # reset counter variable

-                       cp /var/ipfire/time/counter.conf /var/ipfire/time/counter
+                       cp /var/ipfire/time/counter.conf /var/lock/time/counter

                else
                        case $tlanguage in
                                de ) logger -t ipfire "ntpdate fehlerhaft" ;;
                else
                        case $tlanguage in
                                de ) logger -t ipfire "ntpdate fehlerhaft" ;;

diff --git a/src/scripts/timecheck b/src/scripts/timecheck
index 9f75358261a893a08691b94ca871857f7e2f0376..9f581985a0037d26039bba67d3133438e1114391 100644 (file)
--- a/src/scripts/timecheck
+++ b/src/scripts/timecheck
@@ -11,23 +11,23 @@
 # /usr/local/bin/timecheck
 
 if [ -e /var/ipfire/time/enable ]; then
 # /usr/local/bin/timecheck
 
 if [ -e /var/ipfire/time/enable ]; then

-       if [ $(cat /var/ipfire/time/settings | grep period) ] && [ -e /var/ipfire/time/counter ]; then
-               if [ $(cat /var/ipfire/time/counter) -gt 0 ]; then
-                       echo $(($(cat /var/ipfire/time/counter)-5)) > /var/ipfire/time/counter
+       if [ $(cat /var/ipfire/time/settings | grep period) ] && [ -e /var/lock/time/counter ]; then
+               if [ $(cat /var/lock/time/counter) -gt 0 ]; then
+                       echo $(($(cat /var/lock/time/counter)-5)) > /var/lock/time/counter

                else
                else

-                       touch /var/ipfire/time/settimenow
-                       rm -f /var/ipfire/time/counter
+                       touch /var/lock/time/settimenow
+                       rm -f /var/lock/time/counter

                fi
        else
                # EAO added 2003-08-14 for v1.3.1
                # if settings are restored from a backup
                fi
        else
                # EAO added 2003-08-14 for v1.3.1
                # if settings are restored from a backup

-               # /var/ipfire/time/counter will not exist
+               # /var/lock/time/counter will not exist

                if [ $(cat /var/ipfire/time/settings | grep periodic) ]; then
                if [ $(cat /var/ipfire/time/settings | grep periodic) ]; then

-                       touch /var/ipfire/time/settimenow
+                       touch /var/lock/time/settimenow

                fi
        fi
 
                fi
        fi
 

-       if [ -e /var/ipfire/time/settimenow ]; then
+       if [ -e /var/lock/time/settimenow ]; then

                if      [ -e /var/ipfire/time/settime.conf ]; then
                        /usr/local/bin/settime $(cat /var/ipfire/time/settime.conf)
                fi
                if      [ -e /var/ipfire/time/settime.conf ]; then
                        /usr/local/bin/settime $(cat /var/ipfire/time/settime.conf)
                fi