From bede101da597b51b89874fc5adf821896d42fb54 Mon Sep 17 00:00:00 2001 From: "Igor Zalatov (from Citadel PC)" Date: Thu, 9 Sep 2021 11:10:51 +0300 Subject: [PATCH] Update ipctool and some cosmetic changes --- .../package/goke-osdrv-gk7205v200/files/script/S99goke | 4 ++-- .../hisilicon-osdrv-hi3516cv500/files/script/S99hisilicon | 4 ++-- .../hisilicon-osdrv-hi3516ev300/files/script/S99hisilicon | 4 ++-- .../sigmastar-osdrv-ssc335/files/script/S99sigmastar | 4 ++-- general/overlay/etc/init.d/S50snmpd | 4 ++-- general/overlay/etc/init.d/S50telnet | 6 +++--- general/overlay/usr/sbin/sysupgrade | 2 ++ general/package/ipctool/ipctool.mk | 4 ++-- 8 files changed, 17 insertions(+), 15 deletions(-) diff --git a/br-ext-chip-goke/package/goke-osdrv-gk7205v200/files/script/S99goke b/br-ext-chip-goke/package/goke-osdrv-gk7205v200/files/script/S99goke index 83189044..1e08793f 100755 --- a/br-ext-chip-goke/package/goke-osdrv-gk7205v200/files/script/S99goke +++ b/br-ext-chip-goke/package/goke-osdrv-gk7205v200/files/script/S99goke @@ -23,7 +23,7 @@ start() { load_goke -i # printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || (echo "DISABLED" ; exit 1) + [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ -- $DAEMON_ARGS @@ -38,7 +38,7 @@ start() { stop() { printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || (echo "DISABLED" ; exit 1) + [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " start-stop-daemon -K -q -p "$PIDFILE" status=$? if [ "$status" -eq 0 ]; then diff --git a/br-ext-chip-hisilicon/package/hisilicon-osdrv-hi3516cv500/files/script/S99hisilicon b/br-ext-chip-hisilicon/package/hisilicon-osdrv-hi3516cv500/files/script/S99hisilicon index d83e650a..946b1858 100755 --- a/br-ext-chip-hisilicon/package/hisilicon-osdrv-hi3516cv500/files/script/S99hisilicon +++ b/br-ext-chip-hisilicon/package/hisilicon-osdrv-hi3516cv500/files/script/S99hisilicon @@ -23,7 +23,7 @@ start() { load_hisilicon -i # printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || (echo "DISABLED" ; exit 1) + [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ -- $DAEMON_ARGS @@ -38,7 +38,7 @@ start() { stop() { printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || (echo "DISABLED" ; exit 1) + [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " start-stop-daemon -K -q -p "$PIDFILE" status=$? if [ "$status" -eq 0 ]; then diff --git a/br-ext-chip-hisilicon/package/hisilicon-osdrv-hi3516ev300/files/script/S99hisilicon b/br-ext-chip-hisilicon/package/hisilicon-osdrv-hi3516ev300/files/script/S99hisilicon index 9639d294..0a46e8d9 100755 --- a/br-ext-chip-hisilicon/package/hisilicon-osdrv-hi3516ev300/files/script/S99hisilicon +++ b/br-ext-chip-hisilicon/package/hisilicon-osdrv-hi3516ev300/files/script/S99hisilicon @@ -23,7 +23,7 @@ start() { load_hisilicon -i # printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || (echo "DISABLED" ; exit 1) + [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ -- $DAEMON_ARGS @@ -38,7 +38,7 @@ start() { stop() { printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/sbin/$DAEMON ] || (echo "DISABLED" ; exit 1) + [ -f /usr/sbin/$DAEMON ] || echo -en "DISABLED, " start-stop-daemon -K -q -p "$PIDFILE" status=$? if [ "$status" -eq 0 ]; then diff --git a/br-ext-chip-sigmastar/package/sigmastar-osdrv-ssc335/files/script/S99sigmastar b/br-ext-chip-sigmastar/package/sigmastar-osdrv-ssc335/files/script/S99sigmastar index 0b18fae5..e5261f63 100755 --- a/br-ext-chip-sigmastar/package/sigmastar-osdrv-ssc335/files/script/S99sigmastar +++ b/br-ext-chip-sigmastar/package/sigmastar-osdrv-ssc335/files/script/S99sigmastar @@ -22,7 +22,7 @@ start() { load_sigmastar -i # printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || (echo "DISABLED" ; exit 1) + [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ -- $DAEMON_ARGS @@ -37,7 +37,7 @@ start() { stop() { printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || (echo "DISABLED" ; exit 1) + [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " start-stop-daemon -K -q -p "$PIDFILE" status=$? if [ "$status" -eq 0 ]; then diff --git a/general/overlay/etc/init.d/S50snmpd b/general/overlay/etc/init.d/S50snmpd index c195174d..e925ced5 100755 --- a/general/overlay/etc/init.d/S50snmpd +++ b/general/overlay/etc/init.d/S50snmpd @@ -12,7 +12,7 @@ SNMPD_ARGS="-n -4 -c openipc -i eth0 -D OpenIPC -C https://openipc.org -L Intern # and use "-m" to instruct start-stop-daemon to create one. start() { printf 'Starting %s: ' "$DAEMON" - [ -f /usr/sbin/$DAEMON ] || (echo "DISABLED" ; exit 1) + [ -f /usr/sbin/$DAEMON ] || echo -en "DISABLED, " # shellcheck disable=SC2086 # we need the word splitting start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ -- $SNMPD_ARGS @@ -27,7 +27,7 @@ start() { stop() { printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/sbin/$DAEMON ] || (echo "DISABLED" ; exit 1) + [ -f /usr/sbin/$DAEMON ] || echo -en "DISABLED, " start-stop-daemon -K -q -p "$PIDFILE" status=$? if [ "$status" -eq 0 ]; then diff --git a/general/overlay/etc/init.d/S50telnet b/general/overlay/etc/init.d/S50telnet index 4687328e..c2fcd3ad 100755 --- a/general/overlay/etc/init.d/S50telnet +++ b/general/overlay/etc/init.d/S50telnet @@ -8,15 +8,15 @@ TELNETD_ARGS="-F -p 4321 -l /bin/sh" start() { printf "Starting telnetd: " - [ -f /usr/sbin/telnetd ] || (echo "DISABLED" ; exit 1) + [ -f /usr/sbin/telnetd ] || echo -en "DISABLED, " start-stop-daemon -S -q -m -b -p /var/run/telnetd.pid \ -x /usr/sbin/telnetd -- $TELNETD_ARGS - [ $? = 0 ] && echo "OK (port 4321)" || echo "FAIL" + [ $? = 0 ] && echo "OK" || echo "FAIL" } stop() { printf "Stopping telnetd: " - [ -f /usr/sbin/telnetd ] || (echo "DISABLED" ; exit 1) + [ -f /usr/sbin/telnetd ] || echo -en "DISABLED, " start-stop-daemon -K -q -p /var/run/telnetd.pid \ -x /usr/sbin/telnetd [ $? = 0 ] && echo "OK" || echo "FAIL" diff --git a/general/overlay/usr/sbin/sysupgrade b/general/overlay/usr/sbin/sysupgrade index 5824ce27..e91eb3ab 100755 --- a/general/overlay/usr/sbin/sysupgrade +++ b/general/overlay/usr/sbin/sysupgrade @@ -42,6 +42,7 @@ clearing_overlayfs() { quick_reboot() { echo -e "\n\e[1;31mRebooting without any questions...\e[0m\n" + sleep 1 reboot -f } @@ -53,6 +54,7 @@ if [ "$(curl -o /dev/null -s -w '%{http_code}\n' http://github.com)" != "301" ]; else stop_services download_firmware && writing_kernel && writing_rootfs + sleep 1 if [ "$1" = "-n" ]; then clearing_overlayfs fi diff --git a/general/package/ipctool/ipctool.mk b/general/package/ipctool/ipctool.mk index 0cce8072..f9aaecfa 100644 --- a/general/package/ipctool/ipctool.mk +++ b/general/package/ipctool/ipctool.mk @@ -1,10 +1,10 @@ ################################################################################ # -# ipctool | updated 2021.09.02 +# ipctool | updated 2021.09.09 # ################################################################################ -IPCTOOL_VERSION = cfa2c8329419a695e055f2e22d1c37ccd5daa80f +IPCTOOL_VERSION = 5c79eb04a3b240fa3b061bad3651d1a18c9ae30e IPCTOOL_SITE = $(call github,openipc,ipctool,$(IPCTOOL_VERSION)) IPCTOOL_LICENSE = MIT IPCTOOL_LICENSE_FILES = LICENSE