diff options
author | Pierre-Jean Texier <pjtexier@koncepto.io> | 2020-03-01 14:14:28 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-02 21:00:53 +0000 |
commit | 5fb445614eb8d6d68aaf42770462a5fc4f243903 (patch) | |
tree | e5128def9ad1de83af11a47ed69bfd2a0f271b4d /meta/recipes-extended/sysklogd/files/sysklogd | |
parent | 2af240a7d409c9b1988006ebc1a145046fccca41 (diff) | |
download | poky-5fb445614eb8d6d68aaf42770462a5fc4f243903.tar.gz |
sysklogd: upgrade 2.0.3 -> 2.1.1
License-Update: Relicensed under the BSD-3-Clause license since v2.1
Remove patches applied upstream.
Since version v2.1, klogd was removed from the sysklogd project since
syslogd performs logging of kernel messages.
So, this patch remove klogd support.
(From OE-Core rev: c28457322eb6a141d0e8c66fc1c7eee681c0fe88)
Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/sysklogd/files/sysklogd')
-rwxr-xr-x | meta/recipes-extended/sysklogd/files/sysklogd | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/meta/recipes-extended/sysklogd/files/sysklogd b/meta/recipes-extended/sysklogd/files/sysklogd index 4a4ca8a78e..2a356a637a 100755 --- a/meta/recipes-extended/sysklogd/files/sysklogd +++ b/meta/recipes-extended/sysklogd/files/sysklogd | |||
@@ -18,9 +18,7 @@ | |||
18 | PATH=/bin:/usr/bin:/sbin:/usr/sbin | 18 | PATH=/bin:/usr/bin:/sbin:/usr/sbin |
19 | 19 | ||
20 | pidfile_syslogd=/var/run/syslogd.pid | 20 | pidfile_syslogd=/var/run/syslogd.pid |
21 | pidfile_klogd=/var/run/klogd.pid | ||
22 | binpath_syslogd=/usr/sbin/syslogd | 21 | binpath_syslogd=/usr/sbin/syslogd |
23 | binpath_klogd=/usr/sbin/klogd | ||
24 | 22 | ||
25 | test -x $binpath || exit 0 | 23 | test -x $binpath || exit 0 |
26 | 24 | ||
@@ -112,28 +110,16 @@ case "$1" in | |||
112 | create_xconsole | 110 | create_xconsole |
113 | start-stop-daemon --start --quiet --pidfile $pidfile_syslogd --name syslogd --startas $binpath_syslogd -- $SYSLOGD | 111 | start-stop-daemon --start --quiet --pidfile $pidfile_syslogd --name syslogd --startas $binpath_syslogd -- $SYSLOGD |
114 | log_end_msg $? | 112 | log_end_msg $? |
115 | log_begin_msg "Starting kernel log daemon..." | ||
116 | start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD | ||
117 | log_end_msg $? | ||
118 | ;; | 113 | ;; |
119 | stop) | 114 | stop) |
120 | log_begin_msg "Stopping system log daemon..." | 115 | log_begin_msg "Stopping system log daemon..." |
121 | start-stop-daemon --stop --quiet --pidfile $pidfile_syslogd --name syslogd | 116 | start-stop-daemon --stop --quiet --pidfile $pidfile_syslogd --name syslogd |
122 | log_end_msg $? | 117 | log_end_msg $? |
123 | log_begin_msg "Stopping kernel log daemon..." | ||
124 | start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd | ||
125 | log_end_msg $? | ||
126 | ;; | 118 | ;; |
127 | reload|force-reload) | 119 | reload|force-reload) |
128 | log_begin_msg "Reloading system log daemon..." | 120 | log_begin_msg "Reloading system log daemon..." |
129 | start-stop-daemon --stop --quiet --signal 1 --pidfile $pidfile_syslogd --name syslogd | 121 | start-stop-daemon --stop --quiet --signal 1 --pidfile $pidfile_syslogd --name syslogd |
130 | log_end_msg $? | 122 | log_end_msg $? |
131 | log_begin_msg "Reloading kernel log daemon..." | ||
132 | pid=`cat $pidfile_klogd 2> /dev/null` | ||
133 | start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd | ||
134 | waitpid $pid | ||
135 | start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD | ||
136 | log_end_msg $? | ||
137 | ;; | 123 | ;; |
138 | restart) | 124 | restart) |
139 | log_begin_msg "Restarting system log daemon..." | 125 | log_begin_msg "Restarting system log daemon..." |
@@ -142,12 +128,6 @@ case "$1" in | |||
142 | waitpid $pid | 128 | waitpid $pid |
143 | start-stop-daemon --start --quiet --pidfile $pidfile_syslogd --name syslogd --startas $binpath_syslogd -- $SYSLOGD | 129 | start-stop-daemon --start --quiet --pidfile $pidfile_syslogd --name syslogd --startas $binpath_syslogd -- $SYSLOGD |
144 | log_end_msg $? | 130 | log_end_msg $? |
145 | log_begin_msg "Reloading kernel log daemon..." | ||
146 | pid=`cat $pidfile_klogd 2> /dev/null` | ||
147 | start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd | ||
148 | waitpid $pid | ||
149 | start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD | ||
150 | log_end_msg $? | ||
151 | ;; | 131 | ;; |
152 | reload-or-restart) | 132 | reload-or-restart) |
153 | if running | 133 | if running |
@@ -160,8 +140,6 @@ case "$1" in | |||
160 | status) | 140 | status) |
161 | status syslogd | 141 | status syslogd |
162 | RETVAL=$? | 142 | RETVAL=$? |
163 | status klogd | ||
164 | rval=$? | ||
165 | [ $RETVAL -eq 0 ] && exit $rval | 143 | [ $RETVAL -eq 0 ] && exit $rval |
166 | exit $RETVAL | 144 | exit $RETVAL |
167 | ;; | 145 | ;; |