webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-24 09:52:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
Conflicts:
	config/rootfiles/core/40/update.sh
This commit is contained in:
Arne Fitzenreiter
2010-09-13 15:57:05 +02:00
parent 925038e35d 4527e3eb7d
commit 3834d135ec
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/initscripts/init.d/ntp
View File

@@ -9,7 +9,7 @@ eval $(/usr/local/bin/readhash /var/ipfire/time/settings)
case "$1" in
start)
if [ "$ENABLESETONBOOT" == "on" ]; then
boot_mesg "Setting time on booot..."
boot_mesg "Setting time on boot..."
loadproc /usr/local/bin/settime $(cat /var/ipfire/time/settime.conf)
fi