Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/openrc:master commit in: src/rc/, /
Date: Mon, 02 Oct 2017 23:11:49
Message-Id: 1506985749.3c05db74f6e733890e9035c183a774db3d512512.williamh@OpenRC
1 commit: 3c05db74f6e733890e9035c183a774db3d512512
2 Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
3 AuthorDate: Mon Oct 2 23:09:03 2017 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 2 23:09:09 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=3c05db74
7
8 remove service binary
9
10 The service binary was just a synonym for rc-service, so use rc-service
11 instead of service. If you want a "service" binary, it should be
12 something that can determine which service manager you are running and
13 run the appropriate service manager commands.
14
15 guide.md | 3 ---
16 src/rc/Makefile | 4 ++--
17 2 files changed, 2 insertions(+), 5 deletions(-)
18
19 diff --git a/guide.md b/guide.md
20 index e7e8f4b4..f8c23194 100644
21 --- a/guide.md
22 +++ b/guide.md
23 @@ -53,9 +53,6 @@ Calling `openrc` without any arguments will try to reset all services so
24 that the current runlevel is satisfied; if you manually started apache it will be
25 stopped, and if squid died but is in the current runlevel it'll be restarted.
26
27 -There is a `service` helper that emulates the syntax seen on e.g. older Redhat
28 -and Ubuntu (`service nginx start` etc.)
29 -
30 # Runlevels
31
32 OpenRC has a concept of runlevels, similar to what sysvinit historically
33
34 diff --git a/src/rc/Makefile b/src/rc/Makefile
35 index a2c7c306..cb90875c 100644
36 --- a/src/rc/Makefile
37 +++ b/src/rc/Makefile
38 @@ -24,7 +24,7 @@ SBINDIR= ${PREFIX}/sbin
39 LINKDIR= ${LIBEXECDIR}
40
41 BINPROGS= rc-status
42 -SBINPROGS = openrc openrc-run rc rc-service rc-update runscript service \
43 +SBINPROGS = openrc openrc-run rc rc-service rc-update runscript \
44 start-stop-daemon supervise-daemon
45 RC_BINPROGS= einfon einfo ewarnn ewarn eerrorn eerror ebegin eend ewend \
46 eindent eoutdent esyslog eval_ecolors ewaitfile \
47 @@ -150,7 +150,7 @@ rc-depend: rc-depend.o _usage.o rc-misc.o
48 rc-status: rc-status.o _usage.o rc-misc.o
49 ${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
50
51 -rc-service service: rc-service.o _usage.o rc-misc.o
52 +rc-service: rc-service.o _usage.o rc-misc.o
53 ${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
54
55 rc-update: rc-update.o _usage.o rc-misc.o