d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't report errors for the exit status of processes that are killed

Browse Source 
as part of jail removal (IP_STOP_TIMEOUT).

Note a jail as "removed" even if it wasn't jail_remove() that did
the deed, e.g. if it already went away because all its processes
were killed.
This commit is contained in:
Jamie Gritton 2011-07-06 21:49:56 +00:00
parent 600802304e
commit eadec913d9
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/projects/jailconf/; revision=223827
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
usr.sbin/jail/command.c
View File

@ -150,11 +150,15 @@ finish_command(struct cfjail *j)
if (!(j->flags & JF_SLEEPQ))
return 0;
j->flags &= ~JF_SLEEPQ;
if (*j->comparam != IP_STOP_TIMEOUT) {
paralimit++;
if (!TAILQ_EMPTY(&runnable))
requeue(TAILQ_FIRST(&runnable), &ready);
if (*j->comparam == IP_STOP_TIMEOUT)
{
j->flags &= ~JF_TIMEOUT;
j->pstatus = 0;
return 0;
}
paralimit++;
if (!TAILQ_EMPTY(&runnable))
requeue(TAILQ_FIRST(&runnable), &ready);
error = 0;
if (j->flags & JF_TIMEOUT) {
j->flags &= ~JF_TIMEOUT;
@ -270,8 +274,8 @@ run_command(struct cfjail *j)
case IP__OP:
if (down) {
if (jail_remove(j->jid) == 0 && verbose >= 0 &&
(verbose > 0 || (j->flags & JF_STOP
(void)jail_remove(j->jid);
if (verbose > 0 || (verbose == 0 && (j->flags & JF_STOP
? note_remove : j->name != NULL)))
jail_note(j, "removed\n");
j->jid = -1;