Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpnSense
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
OpnSense
Commits
fb97ab7c
Commit
fb97ab7c
authored
Jun 01, 2015
by
Franco Fichtner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntpd: only consumer of sigprogmask magic; can probably do without
parent
4c348813
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
7 deletions
+8
-7
system.inc
src/etc/inc/system.inc
+8
-3
rc.bootup
src/etc/rc.bootup
+0
-2
rc.newwanip
src/etc/rc.newwanip
+0
-1
rc.newwanipv6
src/etc/rc.newwanipv6
+0
-1
No files found.
src/etc/inc/system.inc
View file @
fb97ab7c
...
...
@@ -1553,9 +1553,11 @@ function system_ntp_configure($start_ntpd = true)
return
;
}
/* At bootup we just want to write out the config. */
if
(
!
$start_ntpd
)
if
(
!
$start_ntpd
)
{
/* write out the config and delay startup */
mwexec_bg
(
'/usr/local/sbin/ntpdate_sync_once.sh'
);
return
;
}
/* if ntpd is running, kill it */
while
(
isvalidpid
(
'/var/run/ntpd.pid'
))
{
...
...
@@ -1567,7 +1569,10 @@ function system_ntp_configure($start_ntpd = true)
@
mkdir
(
'/var/empty'
,
0775
,
true
);
/* start opentpd, set time now and use new config */
mwexec
(
'/usr/local/sbin/ntpd -g -c /var/etc/ntpd.conf -p /var/run/ntpd.pid'
,
false
,
true
);
mwexecf
(
'/usr/local/sbin/ntpd -g -c %s -p %s'
,
array
(
'/var/etc/ntpd.conf'
,
'/var/run/ntpd.pid'
)
);
// Note that we are starting up
log_error
(
"NTPD is starting up."
);
...
...
src/etc/rc.bootup
View file @
fb97ab7c
...
...
@@ -259,9 +259,7 @@ services_unbound_configure();
/* Do an initial time sync */
echo
"Starting NTP time client..."
;
/* At bootup this will just write the config, ntpd will launch from ntpdate_sync_once.sh */
system_ntp_configure
(
false
);
mwexec_bg
(
"/usr/local/sbin/ntpdate_sync_once.sh"
,
false
,
true
);
echo
"done.
\n
"
;
/* start load balancer daemon */
...
...
src/etc/rc.newwanip
View file @
fb97ab7c
...
...
@@ -200,7 +200,6 @@ if (!is_ipaddr($oldip) || $curwanip != $oldip || !is_ipaddrv4($config['interface
/* reconfigure ntpd */
system_ntp_configure
(
false
);
mwexec_bg
(
"/usr/local/sbin/ntpdate_sync_once.sh"
,
false
,
true
);
}
/* signal filter reload */
...
...
src/etc/rc.newwanipv6
View file @
fb97ab7c
...
...
@@ -160,4 +160,3 @@ services_igmpproxy_configure();
/* reconfigure ntpd */
system_ntp_configure
(
false
);
mwexec_bg
(
"/usr/local/sbin/ntpdate_sync_once.sh"
,
false
,
true
);
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment