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

make run_stop_schedule accept a pid instead of a pid file

Browse Source
This commit is contained in:
William Hubbs 2017-08-25 11:36:45 -05:00
parent 27c2bd997d
commit 36a0ab9054
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/rc/rc-schedules.c
View File

@ -297,7 +297,7 @@ int do_stop(const char *applet, const char *exec, const char *const *argv,
int run_stop_schedule(const char *applet, int run_stop_schedule(const char *applet,
const char *exec, const char *const *argv, const char *exec, const char *const *argv,
const char *pidfile, uid_t uid, pid_t pid, uid_t uid,
bool test, bool progress) bool test, bool progress)
{ {
SCHEDULEITEM *item = TAILQ_FIRST(&schedule); SCHEDULEITEM *item = TAILQ_FIRST(&schedule);
@ -306,14 +306,13 @@ int run_stop_schedule(const char *applet,
int nrunning = 0; int nrunning = 0;
long nloops, nsecs; long nloops, nsecs;
struct timespec ts; struct timespec ts;
pid_t pid = 0;
const char *const *p; const char *const *p;
bool progressed = false; bool progressed = false;
if (exec) if (exec)
einfov("Will stop %s", exec); einfov("Will stop %s", exec);
if (pidfile) if (pid > 0)
einfov("Will stop PID in pidfile `%s'", pidfile); einfov("Will stop PID %d", pid);
if (uid) if (uid)
einfov("Will stop processes owned by UID %d", uid); einfov("Will stop processes owned by UID %d", uid);
if (argv && *argv) { if (argv && *argv) {
@ -328,12 +327,6 @@ int run_stop_schedule(const char *applet,
} }
} }
if (pidfile) {
pid = get_pid(applet, pidfile);
if (pid == -1)
return 0;
}
while (item) { while (item) {
switch (item->type) { switch (item->type) {
case SC_GOTO: case SC_GOTO:

2
src/rc/rc-schedules.h
View File

@ -21,7 +21,7 @@ int do_stop(const char *applet, const char *exec, const char *const *argv,
pid_t pid, uid_t uid,int sig, bool test); pid_t pid, uid_t uid,int sig, bool test);
int run_stop_schedule(const char *applet, int run_stop_schedule(const char *applet,
const char *exec, const char *const *argv, const char *exec, const char *const *argv,
const char *pidfile, uid_t uid, pid_t pid, uid_t uid,
bool test, bool progress); bool test, bool progress);
#endif #endif

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

@ -657,7 +657,7 @@ int main(int argc, char **argv)
else else
parse_schedule(applet, NULL, sig); parse_schedule(applet, NULL, sig);
i = run_stop_schedule(applet, exec, (const char *const *)margv, i = run_stop_schedule(applet, exec, (const char *const *)margv,
pidfile, uid, test, progress); get_pid(applet, pidfile), uid, test, progress);
if (i < 0) if (i < 0)
/* We failed to stop something */ /* We failed to stop something */