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

openrc-run: clean up runscript deprecation message

Browse Source
This commit is contained in:
William Hubbs 2016-05-04 18:17:58 -05:00
parent 62410eaf4b
commit ad23d5b8db
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rc/openrc-run.c
View File

@ -1106,6 +1106,7 @@ service_plugable(void)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
bool doneone = false; bool doneone = false;
bool runscript = false;
int retval, opt, depoptions = RC_DEP_TRACE; int retval, opt, depoptions = RC_DEP_TRACE;
RC_STRING *svc; RC_STRING *svc;
char path[PATH_MAX], lnk[PATH_MAX]; char path[PATH_MAX], lnk[PATH_MAX];
@ -1123,7 +1124,7 @@ int main(int argc, char **argv)
applet = basename_c(argv[0]); applet = basename_c(argv[0]);
if (strcmp(applet, "runscript") == 0) if (strcmp(applet, "runscript") == 0)
ewarnv("runscript is deprecated, please use openrc-run instead."); runscript = true;
if (stat(argv[1], &stbuf) != 0) { if (stat(argv[1], &stbuf) != 0) {
fprintf(stderr, "openrc-run `%s': %s\n", fprintf(stderr, "openrc-run `%s': %s\n",
@ -1172,6 +1173,9 @@ int main(int argc, char **argv)
if (argc < 3) if (argc < 3)
usage(EXIT_FAILURE); 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 */ /* Change dir to / to ensure all init scripts don't use stuff in pwd */
if (chdir("/") == -1) if (chdir("/") == -1)
eerror("chdir: %s", strerror(errno)); eerror("chdir: %s", strerror(errno));