mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

sysmngr: 1.0.28.3

Browse source 
(cherry picked from commit 1f96c3d295)
This commit is contained in:
Vivek Kumar Dutta 2025-11-05 15:47:15 +05:30
parent 63779cf56e
commit 92d5156a9f
No known key found for this signature in database
GPG key ID: 4E09F5AD8265FD4C
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysmngr/Makefile
View file

@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=sysmngr
PKG_VERSION:=1.0.28.2
PKG_VERSION:=1.0.28.3
LOCAL_DEV:=0
ifneq ($(LOCAL_DEV),1)

28
sysmngr/files/etc/sysmngr/fwbank
View file

@ -135,7 +135,14 @@ case "$1" in
keep_settings=${keep_settings:-1}
if command -v "opconf_conf_handler" >/dev/null 2>&1; then
opconf_conf_handler "${keep_settings:+-k} ${keep_settings}" "${keep_opconf:+-o} ${keep_opconf}" "${config_scope:+-s} ${config_scope}"
arg="-k ${keep_settings}"
[ -n "${keep_opconf}" ] && arg="${arg} -o ${keep_opconf}"
[ -n "${config_scope}" ] && arg="${arg} -s ${config_scope}"
opconf_conf_handler ${arg}
else
# Fallback to default old behaviour in case opconf not present
config_scope="All"
fi
ret=0
@ -207,6 +214,17 @@ case "$1" in
sysupgrade_flag="--no-activate"
fi
if command -v "opconf_conf_handler" >/dev/null 2>&1; then
arg="-k ${keep_settings}"
[ -n "${keep_opconf}" ] && arg="${arg} -o ${keep_opconf}"
[ -n "${config_scope}" ] && arg="${arg} -s ${config_scope}"
opconf_conf_handler ${arg}
else
# Fallback to default old behaviour in case opconf not present
config_scope="All"
fi
# Set the flag to do not save configuration over reflash
if [ "${keep_settings}" -eq 0 ]; then
sysupgrade_flag="${sysupgrade_flag} -n"
@ -216,14 +234,6 @@ case "$1" in
fi
fi
if command -v "opconf_conf_handler" >/dev/null 2>&1; then
arg=""
[ -n "${keep_settings}" ] && arg="-k ${keep_settings}"
[ -n "${keep_opconf}" ] && arg="${arg} -o ${keep_opconf}"
[ -n "${config_scope}" ] && arg="${arg} -s ${config_scope}"
opconf_conf_handler "${arg}"
fi
# Call sysupgrade synchonously. It should not time out the ubus call,
# as it will just verify the image and do an ubus call, leading to
# do_stage2 doing the actual upgrade.