Browse Source

fix(syslog): shellcheck for modules.d/98syslog

master
Harald Hoyer 3 years ago committed by Harald Hoyer
parent
commit
3e1248da7d
  1. 0
      modules.d/98syslog/.shchkdir
  2. 3
      modules.d/98syslog/module-setup.sh
  3. 4
      modules.d/98syslog/parse-syslog-opts.sh
  4. 16
      modules.d/98syslog/rsyslogd-start.sh
  5. 6
      modules.d/98syslog/rsyslogd-stop.sh
  6. 4
      modules.d/98syslog/syslog-cleanup.sh

0
modules.d/98syslog/.shchkdir

3
modules.d/98syslog/module-setup.sh

@ -13,7 +13,6 @@ depends() { @@ -13,7 +13,6 @@ depends() {

# called by dracut
install() {
local _i
local _installs
if find_binary rsyslogd > /dev/null; then
_installs="rsyslogd"
@ -32,7 +31,7 @@ install() { @@ -32,7 +31,7 @@ install() {
inst_hook cleanup 99 "$moddir/syslog-cleanup.sh"
inst_hook initqueue/online 70 "$moddir/rsyslogd-start.sh"
inst_simple "$moddir/rsyslogd-stop.sh" /sbin/rsyslogd-stop
mkdir -m 0755 -p ${initdir}/etc/templates
mkdir -m 0755 -p "${initdir}"/etc/templates
inst_simple "${moddir}/rsyslog.conf" /etc/templates/rsyslog.conf
fi
dracut_need_initqueue

4
modules.d/98syslog/parse-syslog-opts.sh

@ -28,11 +28,11 @@ syslogserver=$(getarg syslog.server -d syslog) @@ -28,11 +28,11 @@ syslogserver=$(getarg syslog.server -d syslog)
syslogfilters=$(getargs syslog.filter -d filter)
syslogtype=$(getarg syslog.type -d syslogtype)

[ -n "$syslogserver" ] && echo $syslogserver > /tmp/syslog.server
[ -n "$syslogserver" ] && echo "$syslogserver" > /tmp/syslog.server
[ -n "$syslogfilters" ] && echo "$syslogfilters" > /tmp/syslog.filters
if [ -n "$syslogtype" ]; then
echo "$syslogtype" > /tmp/syslog.type
else
syslogtype=$(detect_syslog)
echo $syslogtype > /tmp/syslog.type
echo "$syslogtype" > /tmp/syslog.type
fi

16
modules.d/98syslog/rsyslogd-start.sh

@ -6,8 +6,8 @@ type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh @@ -6,8 +6,8 @@ type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh

# prevent starting again if already running
if [ -f /var/run/syslogd.pid ]; then
read pid < /var/run/syslogd.pid
kill -0 $pid && exit 0
read -r pid < /var/run/syslogd.pid
kill -0 "$pid" && exit 0
fi

rsyslog_config() {
@ -18,7 +18,7 @@ rsyslog_config() { @@ -18,7 +18,7 @@ rsyslog_config() {
local filters=$*
local filter=

cat $syslog_template
cat "$syslog_template"

(
# disable shell expansion / globbing
@ -31,14 +31,14 @@ rsyslog_config() { @@ -31,14 +31,14 @@ rsyslog_config() {
#echo "*.* /tmp/syslog"
}

[ -f /tmp/syslog.type ] && read type < /tmp/syslog.type
[ -f /tmp/syslog.server ] && read server < /tmp/syslog.server
[ -f /tmp/syslog.filters ] && read filters < /tmp/syslog.filters
[ -f /tmp/syslog.type ] && read -r type < /tmp/syslog.type
[ -f /tmp/syslog.server ] && read -r server < /tmp/syslog.server
[ -f /tmp/syslog.filters ] && read -r filters < /tmp/syslog.filters
[ -z "$filters" ] && filters="kern.*"
[ -f /tmp/syslog.conf ] && read conf < /tmp/syslog.conf
[ -f /tmp/syslog.conf ] && read -r conf < /tmp/syslog.conf
[ -z "$conf" ] && conf="/etc/rsyslog.conf" && echo "$conf" > /tmp/syslog.conf

if [ $type = "rsyslogd" ]; then
if [ "$type" = "rsyslogd" ]; then
template=/etc/templates/rsyslog.conf
if [ -n "$server" ]; then
rsyslog_config "$server" "$template" "$filters" > $conf

6
modules.d/98syslog/rsyslogd-stop.sh

@ -5,9 +5,9 @@ type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh @@ -5,9 +5,9 @@ type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh
# Kills rsyslogd

if [ -f /var/run/syslogd.pid ]; then
read pid < /var/run/syslogd.pid
kill $pid
kill -0 $pid && kill -9 $pid
read -r pid < /var/run/syslogd.pid
kill "$pid"
kill -0 "$pid" && kill -9 "$pid"
else
warn "rsyslogd-stop: Could not find a pid for rsyslogd. Won't kill it."
fi

4
modules.d/98syslog/syslog-cleanup.sh

@ -5,9 +5,9 @@ @@ -5,9 +5,9 @@
type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh

if [ -f /tmp/syslog.server ]; then
read syslogtype < /tmp/syslog.type
read -r syslogtype < /tmp/syslog.type
if command -v "${syslogtype}-stop" > /dev/null; then
${syslogtype}-stop
"${syslogtype}"-stop
else
warn "syslog-cleanup: Could not find script to stop syslog of type \"$syslogtype\". Syslog will not be stopped."
fi

Loading…
Cancel
Save