diff --git a/Makefile b/Makefile index 00844497..d261208b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -BR_VER = 2024.02 +BR_VER = 2024.02.1 BR_MAKE = $(MAKE) -C $(TARGET)/buildroot-$(BR_VER) BR2_EXTERNAL=$(PWD)/general O=$(TARGET) BR_LINK = https://github.com/buildroot/buildroot/archive BR_FILE = /tmp/buildroot-$(BR_VER).tar.gz diff --git a/general/overlay/usr/sbin/sysupgrade b/general/overlay/usr/sbin/sysupgrade index 651cee47..90c10134 100755 --- a/general/overlay/usr/sbin/sysupgrade +++ b/general/overlay/usr/sbin/sysupgrade @@ -3,7 +3,7 @@ # OpenIPC.org | 2024 # -scr_version=1.0.39 +scr_version=1.0.40 args=" $@" @@ -102,17 +102,17 @@ download_firmware() { free_resources() { echo_c 37 "\nStop services, sync files, free up memory" if [ "$vendor" = "sigmastar" ] || [ "$vendor" = "ingenic" ]; then - killall -q -3 majestic - sleep 1 + /etc/init.d/S95majestic pause else - kill_process majestic + /etc/init.d/S95majestic stop fi - for proc in crond klogd ntpd rngd syslogd; do - kill_process $proc - done + /etc/init.d/S60crond stop + /etc/init.d/S49ntpd stop + /etc/init.d/S02klogd stop + /etc/init.d/S01syslogd stop + sync echo 3 > /proc/sys/vm/drop_caches - echo_c 34 "\nUptime:" uptime echo_c 34 "\nMemory:" @@ -121,16 +121,6 @@ free_resources() { ps | grep -v '\[' } -kill_process() { - echo -n "Killing $1 " - while [ -n "$(pidof $1)" ]; do - killall -q $1 - sleep 0.1 - echo -n "." - done - echo ". OK" -} - set_progress() { if [ "1" = "$silent_update" ]; then busybox "$@" | awk '{print NR, $1}' diff --git a/general/package/busybox/busybox.config b/general/package/busybox/busybox.config index 83d21881..73a40179 100644 --- a/general/package/busybox/busybox.config +++ b/general/package/busybox/busybox.config @@ -778,7 +778,7 @@ CONFIG_CROND=y # CONFIG_FEATURE_CROND_D is not set # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set CONFIG_FEATURE_CROND_SPECIAL_TIMES=y -CONFIG_FEATURE_CROND_DIR="/var/spool/cron" +CONFIG_FEATURE_CROND_DIR="/etc" CONFIG_CRONTAB=y # CONFIG_DEVFSD is not set # CONFIG_DEVFSD_MODLOAD is not set diff --git a/general/package/majestic/files/S95majestic b/general/package/majestic/files/S95majestic index 06629253..c4ede83c 100755 --- a/general/package/majestic/files/S95majestic +++ b/general/package/majestic/files/S95majestic @@ -41,8 +41,20 @@ stop() { fi } +pause() { + printf "Pausing $DAEMON: " + start-stop-daemon -K -s QUIT -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi +} + case "$1" in - start|stop) + start|stop|pause) "$1" ;;