From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-985205-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1B0341396D9 for <garchives@archives.gentoo.org>; Mon, 20 Nov 2017 17:56:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 678B0E0F25; Mon, 20 Nov 2017 17:56:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 423CBE0F25 for <gentoo-commits@lists.gentoo.org>; Mon, 20 Nov 2017 17:56:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 16B5033FE7D for <gentoo-commits@lists.gentoo.org>; Mon, 20 Nov 2017 17:56:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9C812A199 for <gentoo-commits@lists.gentoo.org>; Mon, 20 Nov 2017 17:56:20 +0000 (UTC) From: "William Hubbs" <williamh@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" <williamh@gentoo.org> Message-ID: <1511200546.1732c70fb5e6d75c0d104662d06169978c00a5e8.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:0.34.x commit in: src/rc/ X-VCS-Repository: proj/openrc X-VCS-Files: src/rc/rc-schedules.c X-VCS-Directories: src/rc/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 1732c70fb5e6d75c0d104662d06169978c00a5e8 X-VCS-Branch: 0.34.x Date: Mon, 20 Nov 2017 17:56:20 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fc1bc0c9-a8ff-4832-8cd5-c45a357d85fd X-Archives-Hash: 7f40d4d4a31b2c1494b0cae150a47472 commit: 1732c70fb5e6d75c0d104662d06169978c00a5e8 Author: Doug Freed <dwfreed <AT> mtu <DOT> edu> AuthorDate: Sun Nov 19 16:05:30 2017 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Mon Nov 20 17:55:46 2017 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=1732c70f rc-schedules: if given nothing to look for, stop This avoids trying to kill everything. X-Gentoo-Bug: 631958 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=631958 src/rc/rc-schedules.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/rc/rc-schedules.c b/src/rc/rc-schedules.c index d60c2822..8f36f073 100644 --- a/src/rc/rc-schedules.c +++ b/src/rc/rc-schedules.c @@ -307,6 +307,9 @@ int run_stop_schedule(const char *applet, const char *const *p; bool progressed = false; + if (!(pid > 0 || exec || uid || (argv && *argv))) + return 0; + if (exec) einfov("Will stop %s", exec); if (pid > 0)