Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/preload/files/
Date: Sun, 05 Feb 2017 16:37:14
Message-Id: 1486312545.cb0069d35d88a952030ddef77047bd8f44ce8354.soap@gentoo
1 commit: cb0069d35d88a952030ddef77047bd8f44ce8354
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sun Feb 5 12:22:14 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 5 16:35:45 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb0069d3
7
8 sys-apps/preload: remove unused init
9
10 Closes: https://github.com/gentoo/gentoo/pull/3824
11
12 sys-apps/preload/files/preload-0.6.4.init.in | 50 -------------------
13 sys-apps/preload/files/preload-0.6.4.init.in-r1 | 66 -------------------------
14 2 files changed, 116 deletions(-)
15
16 diff --git a/sys-apps/preload/files/preload-0.6.4.init.in b/sys-apps/preload/files/preload-0.6.4.init.in
17 deleted file mode 100644
18 index d474afb..00000000
19 --- a/sys-apps/preload/files/preload-0.6.4.init.in
20 +++ /dev/null
21 @@ -1,50 +0,0 @@
22 -#!/sbin/openrc-run
23 -
24 -PIDFILE="/var/run/@PACKAGE@.pid"
25 -
26 -depend() {
27 - after localmount
28 - use netmount ntpd
29 -}
30 -
31 -dump() {
32 - ebegin "Dumping config and state for @PACKAGE@"
33 - kill -USR1 $(<${PIDFILE})
34 - kill -USR2 $(<${PIDFILE})
35 - eend $?
36 -}
37 -
38 -reload() {
39 - ebegin "Reloading @PACKAGE@"
40 - kill -HUP $(<${PIDFILE})
41 - eend $?
42 -}
43 -
44 -start() {
45 - ebegin "Starting @PACKAGE@"
46 -
47 - #MIN_MEMORY=${MIN_MEMORY:-256}
48 - # Check for > MIN_MEMORY MB
49 - #free -m | awk '/Mem:/ {exit ($2 >= ('"$MIN_MEMORY"'))?0:1}' || exit 0
50 -
51 - # IMPORTANT: Let ssd do the backgrounding so we immediatly get a valid
52 - # pid file in the next step (ionice)
53 - start-stop-daemon --start --quiet --background \
54 - --make-pidfile --pidfile ${PIDFILE} \
55 - --exec @sbindir@/@PACKAGE@ -- \
56 - -l ${PRELOAD_LOGFILE:-/var/log/preload.log} -V ${PRELOAD_VERBOSITY:-1} \
57 - -n ${PRELOAD_NICE:-15} -s ${PRELOAD_STATEFILE:-""} ${PRELOAD_OPTS} -f
58 -
59 - IONICE=$(which ionice)
60 - if [ -x "$IONICE" ]; then
61 - IONICE_OPTS=${IONICE_OPTS:--c3}
62 - $IONICE ${IONICE_OPTS} -p$(<${PIDFILE})
63 - fi
64 - eend $?
65 -}
66 -
67 -stop() {
68 - ebegin "Stopping @PACKAGE@ (this may take while)"
69 - start-stop-daemon --stop --retry 120 --quiet --pidfile ${PIDFILE}
70 - eend $?
71 -}
72
73 diff --git a/sys-apps/preload/files/preload-0.6.4.init.in-r1 b/sys-apps/preload/files/preload-0.6.4.init.in-r1
74 deleted file mode 100644
75 index 8ef7a96..00000000
76 --- a/sys-apps/preload/files/preload-0.6.4.init.in-r1
77 +++ /dev/null
78 @@ -1,66 +0,0 @@
79 -#!/sbin/openrc-run
80 -
81 -description='Start/stop the preload daemon'
82 -extra_started_commands='dump reload'
83 -description_dump='Dump the config and state of the daemon (to the logfile)'
84 -description_reload='Reload the daemon'
85 -
86 -PIDFILE="/var/run/preload.pid"
87 -
88 -depend() {
89 - after localmount
90 - use netmount ntpd
91 -}
92 -
93 -dump() {
94 - local pid
95 - pid=$(cat ${PIDFILE})
96 -
97 - ebegin "Dumping the config and state of preload"
98 - if [ -n "${pid}" ]; then
99 - kill -USR1 ${pid}
100 - kill -USR2 ${pid}
101 - fi
102 - eend ${?} && \
103 - einfo "These should have been written to ${PRELOAD_LOGFILE:-/var/log/preload.log}"
104 -}
105 -
106 -reload() {
107 - ebegin "Reloading preload"
108 - kill -HUP $(cat ${PIDFILE})
109 - eend ${?}
110 -}
111 -
112 -start() {
113 - local ionice
114 -
115 - ebegin "Starting preload"
116 -
117 - #MIN_MEMORY=${MIN_MEMORY:-256}
118 - # Check for > MIN_MEMORY MB
119 - #free -m | awk '/Mem:/ {exit ($2 >= ('"$MIN_MEMORY"'))?0:1}' || exit 0
120 -
121 - # First try to start with ionice; if that fails, try without.
122 - for ionice in "ionice ${IONICE_OPTS:--c3}" ''; do
123 - # Avoid 'ionice not found' errors
124 - ${ionice:-true} >/dev/null 2>&1 || continue
125 -
126 - ${ionice} start-stop-daemon --start --quiet --background \
127 - --make-pidfile --pidfile ${PIDFILE} \
128 - --exec /usr/sbin/preload -- \
129 - -l ${PRELOAD_LOGFILE:-/var/log/preload.log} \
130 - -V ${PRELOAD_VERBOSITY:-1} \
131 - -n ${PRELOAD_NICE:-15} \
132 - -s ${PRELOAD_STATEFILE:-""} \
133 - ${PRELOAD_OPTS} -f \
134 - && break
135 - done
136 -
137 - eend ${?}
138 -}
139 -
140 -stop() {
141 - ebegin "Stopping preload (this may take a while)"
142 - start-stop-daemon --stop --retry 120 --quiet --pidfile ${PIDFILE}
143 - eend ${?}
144 -}