From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4B75C138222 for ; Wed, 4 May 2016 23:25:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43FFAE085C; Wed, 4 May 2016 23:25:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C7B8221C068 for ; Wed, 4 May 2016 23:25:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DD2AB3406DD for ; Wed, 4 May 2016 23:24:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5283932C for ; Wed, 4 May 2016 23:24:48 +0000 (UTC) From: "William Hubbs" 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" Message-ID: <1462403878.ad23d5b8dbee70815c02271c78f415bcd7088076.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: src/rc/ X-VCS-Repository: proj/openrc X-VCS-Files: src/rc/openrc-run.c X-VCS-Directories: src/rc/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: ad23d5b8dbee70815c02271c78f415bcd7088076 X-VCS-Branch: master Date: Wed, 4 May 2016 23:24:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c0c8662d-9c56-4e8b-8cbf-dbdbf0d1d353 X-Archives-Hash: 81830ef734b03814896495d724de111b commit: ad23d5b8dbee70815c02271c78f415bcd7088076 Author: William Hubbs gmail com> AuthorDate: Wed May 4 23:17:58 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Wed May 4 23:17:58 2016 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=ad23d5b8 openrc-run: clean up runscript deprecation message src/rc/openrc-run.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/rc/openrc-run.c b/src/rc/openrc-run.c index 5e3ba67..dfb4c6f 100644 --- a/src/rc/openrc-run.c +++ b/src/rc/openrc-run.c @@ -1106,6 +1106,7 @@ service_plugable(void) int main(int argc, char **argv) { bool doneone = false; + bool runscript = false; int retval, opt, depoptions = RC_DEP_TRACE; RC_STRING *svc; char path[PATH_MAX], lnk[PATH_MAX]; @@ -1123,7 +1124,7 @@ int main(int argc, char **argv) applet = basename_c(argv[0]); if (strcmp(applet, "runscript") == 0) - ewarnv("runscript is deprecated, please use openrc-run instead."); + runscript = true; if (stat(argv[1], &stbuf) != 0) { fprintf(stderr, "openrc-run `%s': %s\n", @@ -1172,6 +1173,9 @@ int main(int argc, char **argv) if (argc < 3) usage(EXIT_FAILURE); + if (runscript) + ewarnv("%s uses runscript, please convert to openrc-run.", service); + /* Change dir to / to ensure all init scripts don't use stuff in pwd */ if (chdir("/") == -1) eerror("chdir: %s", strerror(errno));