From 916b96f27a6ac9aff9647d5fc471c51693e6c81e Mon Sep 17 00:00:00 2001 From: Paul Philippov Date: Fri, 1 Jul 2022 19:21:19 -0400 Subject: [PATCH 1/2] rename coredump config to match webui settings. check if file exists. --- general/package/goke-osdrv-gk710x/files/script/S95goke | 2 +- general/package/goke-osdrv-gk7205v200/files/script/S95goke | 2 +- .../hisilicon-osdrv-hi3516av100/files/script/S95hisilicon | 2 +- .../hisilicon-osdrv-hi3516cv100/files/script/S95hisilicon | 2 +- .../hisilicon-osdrv-hi3516cv200/files/script/S95hisilicon | 2 +- .../hisilicon-osdrv-hi3516cv300/files/script/S95hisilicon | 2 +- .../hisilicon-osdrv-hi3516cv500/files/script/S95hisilicon | 2 +- .../hisilicon-osdrv-hi3516ev300/files/script/S95hisilicon | 2 +- .../hisilicon-osdrv-hi3519v101/files/script/S95hisilicon | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/general/package/goke-osdrv-gk710x/files/script/S95goke b/general/package/goke-osdrv-gk710x/files/script/S95goke index 89bd0404..e6079134 100755 --- a/general/package/goke-osdrv-gk710x/files/script/S95goke +++ b/general/package/goke-osdrv-gk710x/files/script/S95goke @@ -12,7 +12,7 @@ load_majestic() { printf 'Starting %s: ' "$DAEMON" [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting - if [ $(grep ^savedumps /etc/coredump.config | cut -d= -f2) == "true" ]; then + if [ -f /etc/coredump.conf ] && [ $(grep ^savedumps /etc/coredump.conf | cut -d= -f2) == "true" ]; then ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern fi start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ diff --git a/general/package/goke-osdrv-gk7205v200/files/script/S95goke b/general/package/goke-osdrv-gk7205v200/files/script/S95goke index 85670764..a27d0385 100755 --- a/general/package/goke-osdrv-gk7205v200/files/script/S95goke +++ b/general/package/goke-osdrv-gk7205v200/files/script/S95goke @@ -12,7 +12,7 @@ load_majestic() { printf 'Starting %s: ' "$DAEMON" [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting - if [ $(grep ^savedumps /etc/coredump.config | cut -d= -f2) == "true" ]; then + if [ -f /etc/coredump.conf ] && [ $(grep ^savedumps /etc/coredump.conf | cut -d= -f2) == "true" ]; then ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern fi start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ diff --git a/general/package/hisilicon-osdrv-hi3516av100/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516av100/files/script/S95hisilicon index 8efa6cb4..ce583806 100755 --- a/general/package/hisilicon-osdrv-hi3516av100/files/script/S95hisilicon +++ b/general/package/hisilicon-osdrv-hi3516av100/files/script/S95hisilicon @@ -12,7 +12,7 @@ load_majestic() { printf 'Starting %s: ' "$DAEMON" [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting - if [ $(grep ^savedumps /etc/coredump.config | cut -d= -f2) == "true" ]; then + if [ -f /etc/coredump.conf ] && [ $(grep ^savedumps /etc/coredump.conf | cut -d= -f2) == "true" ]; then ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern fi start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ diff --git a/general/package/hisilicon-osdrv-hi3516cv100/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516cv100/files/script/S95hisilicon index afa9188c..547d91d1 100755 --- a/general/package/hisilicon-osdrv-hi3516cv100/files/script/S95hisilicon +++ b/general/package/hisilicon-osdrv-hi3516cv100/files/script/S95hisilicon @@ -12,7 +12,7 @@ load_majestic() { printf 'Starting %s: ' "$DAEMON" [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting - if [ $(grep ^savedumps /etc/coredump.config | cut -d= -f2) == "true" ]; then + if [ -f /etc/coredump.conf ] && [ $(grep ^savedumps /etc/coredump.conf | cut -d= -f2) == "true" ]; then ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern fi start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ diff --git a/general/package/hisilicon-osdrv-hi3516cv200/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516cv200/files/script/S95hisilicon index d006c975..66e4dada 100755 --- a/general/package/hisilicon-osdrv-hi3516cv200/files/script/S95hisilicon +++ b/general/package/hisilicon-osdrv-hi3516cv200/files/script/S95hisilicon @@ -12,7 +12,7 @@ load_majestic() { printf 'Starting %s: ' "$DAEMON" [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting - if [ $(grep ^savedumps /etc/coredump.config | cut -d= -f2) == "true" ]; then + if [ -f /etc/coredump.conf ] && [ $(grep ^savedumps /etc/coredump.conf | cut -d= -f2) == "true" ]; then ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern fi start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ diff --git a/general/package/hisilicon-osdrv-hi3516cv300/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516cv300/files/script/S95hisilicon index afa9188c..547d91d1 100755 --- a/general/package/hisilicon-osdrv-hi3516cv300/files/script/S95hisilicon +++ b/general/package/hisilicon-osdrv-hi3516cv300/files/script/S95hisilicon @@ -12,7 +12,7 @@ load_majestic() { printf 'Starting %s: ' "$DAEMON" [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting - if [ $(grep ^savedumps /etc/coredump.config | cut -d= -f2) == "true" ]; then + if [ -f /etc/coredump.conf ] && [ $(grep ^savedumps /etc/coredump.conf | cut -d= -f2) == "true" ]; then ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern fi start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ diff --git a/general/package/hisilicon-osdrv-hi3516cv500/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516cv500/files/script/S95hisilicon index 5d1e719b..69b7fc66 100755 --- a/general/package/hisilicon-osdrv-hi3516cv500/files/script/S95hisilicon +++ b/general/package/hisilicon-osdrv-hi3516cv500/files/script/S95hisilicon @@ -12,7 +12,7 @@ load_majestic() { printf 'Starting %s: ' "$DAEMON" [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting - if [ $(grep ^savedumps /etc/coredump.config | cut -d= -f2) == "true" ]; then + if [ -f /etc/coredump.conf ] && [ $(grep ^savedumps /etc/coredump.conf | cut -d= -f2) == "true" ]; then ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern fi start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516ev300/files/script/S95hisilicon index d006c975..66e4dada 100755 --- a/general/package/hisilicon-osdrv-hi3516ev300/files/script/S95hisilicon +++ b/general/package/hisilicon-osdrv-hi3516ev300/files/script/S95hisilicon @@ -12,7 +12,7 @@ load_majestic() { printf 'Starting %s: ' "$DAEMON" [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting - if [ $(grep ^savedumps /etc/coredump.config | cut -d= -f2) == "true" ]; then + if [ -f /etc/coredump.conf ] && [ $(grep ^savedumps /etc/coredump.conf | cut -d= -f2) == "true" ]; then ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern fi start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ diff --git a/general/package/hisilicon-osdrv-hi3519v101/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3519v101/files/script/S95hisilicon index d006c975..66e4dada 100755 --- a/general/package/hisilicon-osdrv-hi3519v101/files/script/S95hisilicon +++ b/general/package/hisilicon-osdrv-hi3519v101/files/script/S95hisilicon @@ -12,7 +12,7 @@ load_majestic() { printf 'Starting %s: ' "$DAEMON" [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting - if [ $(grep ^savedumps /etc/coredump.config | cut -d= -f2) == "true" ]; then + if [ -f /etc/coredump.conf ] && [ $(grep ^savedumps /etc/coredump.conf | cut -d= -f2) == "true" ]; then ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern fi start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ From 49324ac8179c4d057bdcb1d67ff4ef97b7a0aa0b Mon Sep 17 00:00:00 2001 From: Paul Philippov Date: Fri, 1 Jul 2022 22:45:43 -0400 Subject: [PATCH 2/2] swap compared parts replace == with =, because it is ash indent with tabs --- general/package/goke-osdrv-gk710x/files/script/S95goke | 6 +++--- general/package/goke-osdrv-gk7205v200/files/script/S95goke | 6 +++--- .../hisilicon-osdrv-hi3516av100/files/script/S95hisilicon | 6 +++--- .../hisilicon-osdrv-hi3516cv100/files/script/S95hisilicon | 6 +++--- .../hisilicon-osdrv-hi3516cv200/files/script/S95hisilicon | 6 +++--- .../hisilicon-osdrv-hi3516cv300/files/script/S95hisilicon | 6 +++--- .../hisilicon-osdrv-hi3516cv500/files/script/S95hisilicon | 6 +++--- .../hisilicon-osdrv-hi3516ev300/files/script/S95hisilicon | 6 +++--- .../hisilicon-osdrv-hi3519v101/files/script/S95hisilicon | 6 +++--- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/general/package/goke-osdrv-gk710x/files/script/S95goke b/general/package/goke-osdrv-gk710x/files/script/S95goke index e6079134..ef470de6 100755 --- a/general/package/goke-osdrv-gk710x/files/script/S95goke +++ b/general/package/goke-osdrv-gk710x/files/script/S95goke @@ -12,9 +12,9 @@ load_majestic() { printf 'Starting %s: ' "$DAEMON" [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting - if [ -f /etc/coredump.conf ] && [ $(grep ^savedumps /etc/coredump.conf | cut -d= -f2) == "true" ]; then - ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern - fi + if [ -f /etc/coredump.conf ] && [ "true" = "$(grep ^savedumps /etc/coredump.conf | cut -d= -f2)" ]; then + ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern + fi start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ -- $DAEMON_ARGS status=$? diff --git a/general/package/goke-osdrv-gk7205v200/files/script/S95goke b/general/package/goke-osdrv-gk7205v200/files/script/S95goke index a27d0385..94a011ee 100755 --- a/general/package/goke-osdrv-gk7205v200/files/script/S95goke +++ b/general/package/goke-osdrv-gk7205v200/files/script/S95goke @@ -12,9 +12,9 @@ load_majestic() { printf 'Starting %s: ' "$DAEMON" [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting - if [ -f /etc/coredump.conf ] && [ $(grep ^savedumps /etc/coredump.conf | cut -d= -f2) == "true" ]; then - ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern - fi + if [ -f /etc/coredump.conf ] && [ "true" = "$(grep ^savedumps /etc/coredump.conf | cut -d= -f2)" ]; then + ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern + fi start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ -- $DAEMON_ARGS status=$? diff --git a/general/package/hisilicon-osdrv-hi3516av100/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516av100/files/script/S95hisilicon index ce583806..379bd18b 100755 --- a/general/package/hisilicon-osdrv-hi3516av100/files/script/S95hisilicon +++ b/general/package/hisilicon-osdrv-hi3516av100/files/script/S95hisilicon @@ -12,9 +12,9 @@ load_majestic() { printf 'Starting %s: ' "$DAEMON" [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting - if [ -f /etc/coredump.conf ] && [ $(grep ^savedumps /etc/coredump.conf | cut -d= -f2) == "true" ]; then - ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern - fi + if [ -f /etc/coredump.conf ] && [ "true" = "$(grep ^savedumps /etc/coredump.conf | cut -d= -f2)" ]; then + ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern + fi start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ -- $DAEMON_ARGS status=$? diff --git a/general/package/hisilicon-osdrv-hi3516cv100/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516cv100/files/script/S95hisilicon index 547d91d1..83b954da 100755 --- a/general/package/hisilicon-osdrv-hi3516cv100/files/script/S95hisilicon +++ b/general/package/hisilicon-osdrv-hi3516cv100/files/script/S95hisilicon @@ -12,9 +12,9 @@ load_majestic() { printf 'Starting %s: ' "$DAEMON" [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting - if [ -f /etc/coredump.conf ] && [ $(grep ^savedumps /etc/coredump.conf | cut -d= -f2) == "true" ]; then - ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern - fi + if [ -f /etc/coredump.conf ] && [ "true" = "$(grep ^savedumps /etc/coredump.conf | cut -d= -f2)" ]; then + ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern + fi start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ -- $DAEMON_ARGS status=$? diff --git a/general/package/hisilicon-osdrv-hi3516cv200/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516cv200/files/script/S95hisilicon index 66e4dada..61b60d21 100755 --- a/general/package/hisilicon-osdrv-hi3516cv200/files/script/S95hisilicon +++ b/general/package/hisilicon-osdrv-hi3516cv200/files/script/S95hisilicon @@ -12,9 +12,9 @@ load_majestic() { printf 'Starting %s: ' "$DAEMON" [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting - if [ -f /etc/coredump.conf ] && [ $(grep ^savedumps /etc/coredump.conf | cut -d= -f2) == "true" ]; then - ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern - fi + if [ -f /etc/coredump.conf ] && [ "true" = "$(grep ^savedumps /etc/coredump.conf | cut -d= -f2)" ]; then + ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern + fi start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ -- $DAEMON_ARGS status=$? diff --git a/general/package/hisilicon-osdrv-hi3516cv300/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516cv300/files/script/S95hisilicon index 547d91d1..83b954da 100755 --- a/general/package/hisilicon-osdrv-hi3516cv300/files/script/S95hisilicon +++ b/general/package/hisilicon-osdrv-hi3516cv300/files/script/S95hisilicon @@ -12,9 +12,9 @@ load_majestic() { printf 'Starting %s: ' "$DAEMON" [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting - if [ -f /etc/coredump.conf ] && [ $(grep ^savedumps /etc/coredump.conf | cut -d= -f2) == "true" ]; then - ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern - fi + if [ -f /etc/coredump.conf ] && [ "true" = "$(grep ^savedumps /etc/coredump.conf | cut -d= -f2)" ]; then + ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern + fi start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ -- $DAEMON_ARGS status=$? diff --git a/general/package/hisilicon-osdrv-hi3516cv500/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516cv500/files/script/S95hisilicon index 69b7fc66..e96356d7 100755 --- a/general/package/hisilicon-osdrv-hi3516cv500/files/script/S95hisilicon +++ b/general/package/hisilicon-osdrv-hi3516cv500/files/script/S95hisilicon @@ -12,9 +12,9 @@ load_majestic() { printf 'Starting %s: ' "$DAEMON" [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting - if [ -f /etc/coredump.conf ] && [ $(grep ^savedumps /etc/coredump.conf | cut -d= -f2) == "true" ]; then - ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern - fi + if [ -f /etc/coredump.conf ] && [ "true" = "$(grep ^savedumps /etc/coredump.conf | cut -d= -f2)" ]; then + ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern + fi start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ -- $DAEMON_ARGS status=$? diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516ev300/files/script/S95hisilicon index 66e4dada..61b60d21 100755 --- a/general/package/hisilicon-osdrv-hi3516ev300/files/script/S95hisilicon +++ b/general/package/hisilicon-osdrv-hi3516ev300/files/script/S95hisilicon @@ -12,9 +12,9 @@ load_majestic() { printf 'Starting %s: ' "$DAEMON" [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting - if [ -f /etc/coredump.conf ] && [ $(grep ^savedumps /etc/coredump.conf | cut -d= -f2) == "true" ]; then - ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern - fi + if [ -f /etc/coredump.conf ] && [ "true" = "$(grep ^savedumps /etc/coredump.conf | cut -d= -f2)" ]; then + ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern + fi start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ -- $DAEMON_ARGS status=$? diff --git a/general/package/hisilicon-osdrv-hi3519v101/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3519v101/files/script/S95hisilicon index 66e4dada..61b60d21 100755 --- a/general/package/hisilicon-osdrv-hi3519v101/files/script/S95hisilicon +++ b/general/package/hisilicon-osdrv-hi3519v101/files/script/S95hisilicon @@ -12,9 +12,9 @@ load_majestic() { printf 'Starting %s: ' "$DAEMON" [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting - if [ -f /etc/coredump.conf ] && [ $(grep ^savedumps /etc/coredump.conf | cut -d= -f2) == "true" ]; then - ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern - fi + if [ -f /etc/coredump.conf ] && [ "true" = "$(grep ^savedumps /etc/coredump.conf | cut -d= -f2)" ]; then + ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern + fi start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ -- $DAEMON_ARGS status=$?