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 20:57:24 +0000 |
| commit | c28457322eb6a141d0e8c66fc1c7eee681c0fe88 (patch) | |
| tree | 4bf8812cc7aa1592bee308ff7d2fd51d5ac5d425 /meta/recipes-extended/sysklogd/files/sysklogd | |
| parent | 2497b28b14bd70c0a4c94fc22a74ea62c527b410 (diff) | |
| download | openembedded-core-c28457322eb6a141d0e8c66fc1c7eee681c0fe88.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.
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 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin pidfile_syslogd=/var/run/syslogd.pid -pidfile_klogd=/var/run/klogd.pid binpath_syslogd=/usr/sbin/syslogd -binpath_klogd=/usr/sbin/klogd test -x $binpath || exit 0 @@ -112,28 +110,16 @@ case "$1" in create_xconsole start-stop-daemon --start --quiet --pidfile $pidfile_syslogd --name syslogd --startas $binpath_syslogd -- $SYSLOGD log_end_msg $? - log_begin_msg "Starting kernel log daemon..." - start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD - log_end_msg $? ;; stop) log_begin_msg "Stopping system log daemon..." start-stop-daemon --stop --quiet --pidfile $pidfile_syslogd --name syslogd log_end_msg $? - log_begin_msg "Stopping kernel log daemon..." - start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd - log_end_msg $? ;; reload|force-reload) log_begin_msg "Reloading system log daemon..." start-stop-daemon --stop --quiet --signal 1 --pidfile $pidfile_syslogd --name syslogd log_end_msg $? - log_begin_msg "Reloading kernel log daemon..." - pid=`cat $pidfile_klogd 2> /dev/null` - start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd - waitpid $pid - start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD - log_end_msg $? ;; restart) log_begin_msg "Restarting system log daemon..." @@ -142,12 +128,6 @@ case "$1" in waitpid $pid start-stop-daemon --start --quiet --pidfile $pidfile_syslogd --name syslogd --startas $binpath_syslogd -- $SYSLOGD log_end_msg $? - log_begin_msg "Reloading kernel log daemon..." - pid=`cat $pidfile_klogd 2> /dev/null` - start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd - waitpid $pid - start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD - log_end_msg $? ;; reload-or-restart) if running @@ -160,8 +140,6 @@ case "$1" in status) status syslogd RETVAL=$? - status klogd - rval=$? [ $RETVAL -eq 0 ] && exit $rval exit $RETVAL ;; |