1 |
commit: 34404d32000704023999e6f49a1d2af396f74538 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 1 03:07:22 2017 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 1 03:08:36 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34404d32 |
7 |
|
8 |
dev-db/etcd: cleanup init script |
9 |
|
10 |
Package-Manager: Portage-2.3.8, Repoman-2.3.2 |
11 |
|
12 |
dev-db/etcd/files/etcd.initd | 62 ++++++++++++++++---------------------------- |
13 |
1 file changed, 22 insertions(+), 40 deletions(-) |
14 |
|
15 |
diff --git a/dev-db/etcd/files/etcd.initd b/dev-db/etcd/files/etcd.initd |
16 |
index 55760d7c3c5..c9caecf7ff6 100644 |
17 |
--- a/dev-db/etcd/files/etcd.initd |
18 |
+++ b/dev-db/etcd/files/etcd.initd |
19 |
@@ -1,13 +1,21 @@ |
20 |
#!/sbin/openrc-run |
21 |
-# Copyright 1999-2014 Gentoo Foundation |
22 |
+# Copyright 1999-2017 Gentoo Foundation |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
|
25 |
-SVCNAME=etcd |
26 |
-PIDPATH=/var/run/${SVCNAME} |
27 |
-PIDFILE=${PIDPATH}/${SVCNAME}.pid |
28 |
-LOGPATH=/var/log/${SVCNAME} |
29 |
-DATADIR=/var/lib/${SVCNAME} |
30 |
-USER=$SVCNAME |
31 |
+pidfile=/run/${RC_SVCNAME}.pid |
32 |
+LOGPATH=/var/log/${RC_SVCNAME} |
33 |
+DATADIR=/var/lib/${RC_SVCNAME} |
34 |
+command_user=${RC_SVCNAME} |
35 |
+command=/usr/bin/etcd |
36 |
+command_args=" |
37 |
+ -name=${ETCD_NAME} |
38 |
+ -data-dir=${ETCD_DATA_DIR} |
39 |
+ ${ETCD_OPTS}" |
40 |
+command_background=true |
41 |
+start_stop_daemon_args=" |
42 |
+ --chdir ${ETCD_DATA_DIR} |
43 |
+ -1 ${LOGPATH}/${RC_SVCNAME}.log |
44 |
+ -2 ${LOGPATH}/${RC_SVCNAME}.err" |
45 |
|
46 |
depend() { |
47 |
need net |
48 |
@@ -15,39 +23,13 @@ depend() { |
49 |
after bootmisc |
50 |
} |
51 |
|
52 |
-start() { |
53 |
- if [ ! -d "$PIDPATH" ] ; then |
54 |
- mkdir -p "$PIDPATH" |
55 |
- chown $USER:$USER "$PIDPATH" |
56 |
+start_pre() { |
57 |
+ if [ ! -d "${LOGPATH}" ] ; then |
58 |
+ mkdir -p "${LOGPATH}" |
59 |
+ chown "${command_user}:${command_user}" "${LOGPATH}" |
60 |
fi |
61 |
- if [ ! -d "$LOGPATH" ] ; then |
62 |
- mkdir -p "$LOGPATH" |
63 |
- chown $USER:$USER "$LOGPATH" |
64 |
+ if [ ! -d "${ETCD_DATA_DIR}" ] ; then |
65 |
+ mkdir -p "${ETCD_DATA_DIR}" |
66 |
+ chown "${command_user}:${command_user}" "${ETCD_DATA_DIR}" |
67 |
fi |
68 |
- if [ ! -d "$ETCD_DATA_DIR" ] ; then |
69 |
- mkdir -p "$ETCD_DATA_DIR" |
70 |
- chown $USER:$USER "$ETCD_DATA_DIR" |
71 |
- fi |
72 |
- |
73 |
- ebegin "Starting $SVCNAME" |
74 |
- start-stop-daemon --start \ |
75 |
- --pidfile "$PIDFILE" \ |
76 |
- --user $USER \ |
77 |
- --chdir "$ETCD_DATA_DIR" \ |
78 |
- -1 "$LOGPATH/$SVCNAME.log" \ |
79 |
- -2 "$LOGPATH/$SVCNAME.err" \ |
80 |
- --background \ |
81 |
- --make-pidfile \ |
82 |
- --exec /usr/bin/etcd -- \ |
83 |
- -name=$ETCD_NAME \ |
84 |
- -data-dir="$ETCD_DATA_DIR" \ |
85 |
- $ETCD_OPTS |
86 |
- eend $? "Failed to start $SVCNAME" |
87 |
-} |
88 |
- |
89 |
-stop() { |
90 |
- ebegin "Stopping $SVCNAME" |
91 |
- start-stop-daemon --stop --pidfile $PIDFILE |
92 |
- eend $? "Failed to stop $SVCNAME" |
93 |
- rm -f "$PIDFILE" |
94 |
} |