webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 19:15:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

Browse Source
This commit is contained in:
Michael Tremer
2010-12-02 22:09:35 +01:00
parent 0381e7a697 3118e3a24e
commit f37c3a4f65
10 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/common/initscripts
View File

@@ -216,3 +216,4 @@ etc/sysconfig/firewall.local
etc/sysconfig/modules
etc/sysconfig/rc
etc/sysconfig/rc.local
etc/init.d

7
config/rootfiles/common/ntp
View File

@@ -16,3 +16,10 @@ usr/sbin/ntpq
usr/sbin/ntptime
usr/sbin/ntptrace
usr/sbin/tickadj
etc/rc.d/rc0.d/K46ntpd
etc/rc.d/rc6.d/K46ntpd
etc/rc.d/rc3.d/S26ntpd
var/ipfire/time/counter.conf
var/ipfire/time/enable
var/ipfire/time/settime.conf
var/ipfire/time/settings

1
config/rootfiles/core/43/filelists/files
View File

@@ -11,6 +11,7 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi
srv/web/ipfire/html/images/urlfilter/copy.gif
var/ipfire/general-functions.pl
var/ipfire/extrahd/bin/extrahd.pl
usr/local/bin/timectrl
usr/local/bin/rebuild-initrd
usr/local/bin/scanhd
usr/local/sbin/setup

1
config/time/counter.conf Normal file
View File

@@ -0,0 +1 @@
1435

0
config/time/enable Normal file
View File

1
config/time/settime.conf Normal file
View File

@@ -0,0 +1 @@
0.ipfire.pool.ntp.org 1.ipfire.pool.ntp.org

9
config/time/settings Normal file
View File

@@ -0,0 +1,9 @@
UPDATE_VALUE=1
ENABLENTP=on
VALID=yes
ENABLECLNTP=off
ENABLESETONBOOT=on
NTP_ADDR_2=1.ipfire.pool.ntp.org
NTP_ADDR_1=0.ipfire.pool.ntp.org
UPDATE_PERIOD=daily
UPDATE_METHOD=periodically

4
html/cgi-bin/time.cgi
View File

@@ -174,8 +174,8 @@ if ($timesettings{'VALID'} eq '')
$timesettings{'UPDATE_METHOD'} = 'manually';
$timesettings{'UPDATE_VALUE'} = '1';
$timesettings{'UPDATE_PERIOD'} = 'daily';
$timesettings{'NTP_ADDR_1'} = 'de.pool.ntp.org';
$timesettings{'NTP_ADDR_2'} = 'pool.ntp.org';
$timesettings{'NTP_ADDR_1'} = '0.ipfire.pool.ntp.org';
$timesettings{'NTP_ADDR_2'} = '1.ipfire.pool.ntp.org';
$timesettings{'ENABLESETONBOOT'} = 'off';
}

9
lfs/ntp
View File

@@ -81,5 +81,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
echo "server 127.127.1.0" >> /etc/ntp.conf
echo "fudge 127.127.1.0 stratum 10" >> /etc/ntp.conf
echo "driftfile /etc/ntp/drift" >> /etc/ntp.conf
#Enable it by default...
cp -vf $(DIR_SRC)/config/time/* /var/ipfire/time/
chmod 644 /var/ipfire/time/*
chown nobody:nobody /var/ipfire/time/*
ln -s ../init.d/ntp /etc/rc.d/rc0.d/K46ntpd
ln -s ../init.d/ntp /etc/rc.d/rc6.d/K46ntpd
ln -s ../init.d/ntp /etc/rc.d/rc3.d/S26ntpd
@rm -rf $(DIR_APP)
@$(POSTBUILD)

2
src/misc-progs/timectrl.c
View File

@@ -36,7 +36,7 @@ int main(int argc, char *argv[]) {
safe_system("/etc/rc.d/init.d/ntp start");
} else if (strcmp(argv[1], "disable") == 0) {
safe_system("/etc/rc.d/init.d/ntpd stop");
safe_system("rm -f /etc/rc.d/rc*.d/*ntp >/dev/null 2>&1");
safe_system("rm -f /etc/rc.d/rc*.d/*ntpd >/dev/null 2>&1");
} else {
fprintf(stderr, "\nBad argument given.\n\ntimectrl (start|stop|restart)\n\n");
exit(1);