emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix wait time for gentoo bug 288495

Browse Source 
The wait time was in seconds.  This patch converts it to milliseconds.
This commit is contained in:
William Hubbs 2009-10-11 13:22:46 -05:00 committed by Roy Marples
parent fdca530d4f
commit c96a015742
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
man/start-stop-daemon.8
View File

@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE. .\" SUCH DAMAGE.
.\" .\"
.Dd September 4, 2009 .Dd October 14, 2009
.Dt START-STOP-DAEMON 8 SMM .Dt START-STOP-DAEMON 8 SMM
.Os OpenRC .Os OpenRC
.Sh NAME .Sh NAME
@ -144,9 +144,9 @@ Redirect the standard output of the process to logfile when started with
Must be an absolute pathname, but relative to the path optionally given with Must be an absolute pathname, but relative to the path optionally given with
.Fl r , -chroot . .Fl r , -chroot .
The logfile can also be a named pipe. The logfile can also be a named pipe.
.It Fl w , -wait Ar seconds .It Fl w , -wait Ar milliseconds
Wait Wait
.Ar seconds .Ar milliseconds
after starting and check that daemon is still running. after starting and check that daemon is still running.
Useful for daemons that check configuration after forking or stopping race Useful for daemons that check configuration after forking or stopping race
conditions where the pidfile is written out after forking. conditions where the pidfile is written out after forking.

7
src/rc/start-stop-daemon.c
View File

@ -37,6 +37,7 @@
#define POLL_INTERVAL 20000000 #define POLL_INTERVAL 20000000
#define WAIT_PIDFILE 500000000 #define WAIT_PIDFILE 500000000
#define ONE_SECOND 1000000000 #define ONE_SECOND 1000000000
#define ONE_MS 1000000
#include <sys/types.h> #include <sys/types.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -638,7 +639,7 @@ static const char * const longopts_help[] = {
"Test actions, don't do them", "Test actions, don't do them",
"Change the process user", "Change the process user",
"Chroot to this directory", "Chroot to this directory",
"Seconds to wait for daemon start", "Milliseconds to wait for daemon start",
"Binary to start/stop", "Binary to start/stop",
"Redirect stdout to file", "Redirect stdout to file",
"Redirect stderr to file", "Redirect stderr to file",
@ -1311,8 +1312,8 @@ start_stop_daemon(int argc, char **argv)
struct timespec ts; struct timespec ts;
bool alive = false; bool alive = false;
ts.tv_sec = start_wait; ts.tv_sec = start_wait / 1000;
ts.tv_nsec = 0; ts.tv_nsec = (start_wait % 1000) * ONE_MS;
if (nanosleep(&ts, NULL) == -1) { if (nanosleep(&ts, NULL) == -1) {
if (errno == EINTR) if (errno == EINTR)
eerror("%s: caught an interrupt", applet); eerror("%s: caught an interrupt", applet);