This commit is contained in:
2025-06-01 13:02:22 -05:00
parent 9a3675e902
commit 7ee00e0896
2 changed files with 26 additions and 6 deletions

View File

@@ -2,7 +2,7 @@
action="$1" action="$1"
FOLDER='/opt/idssys/linupx' FOLDER='/opt/idssys/linupx'
VERS='6.60.36-05032025' VERS='6.60.38-06012025'
IPERFVER="3.15" IPERFVER="3.15"

View File

@@ -22,6 +22,7 @@ UPDATE1() {
[[ "$useAutoremove" -ne 0 ]] && AUTOREMOVE [[ "$useAutoremove" -ne 0 ]] && AUTOREMOVE
${APTFUNC} update ${APTFUNC} update
[ -f ${NM_FOLDER}/conf/defaults.local.inc ] && /usr/local/bin/nmg skip on
${APTFUNC} upgrade -y ${APTFUNC} upgrade -y
${APTFUNC} dist-upgrade ${APTFUNC} dist-upgrade
@@ -34,7 +35,16 @@ UPDATE1() {
echo echo
echo -e "${idsCL[Green]}Updates have completed${idsCL[Default]}" echo -e "${idsCL[Green]}Updates have completed${idsCL[Default]}"
[ ${action-x} ] && exit 0 [ ${action-x} ] && exit 0
ENTER2CONTINUE if [ -f ${NM_FOLDER}/conf/defaults.local.inc ]; then
echo
read -n 1 -p "Would you like to disable NMG SKIP and reboot right away (Y/n)?" choice
case "$choice" in
[Nn]) tmp=temp;;
* ) /usr/local/bin/nmg skip reboot;;
esac
else
ENTER2CONTINUE
fi
} }
UPDATE2() { UPDATE2() {
if [ "$opennms" = true ]; then if [ "$opennms" = true ]; then
@@ -42,7 +52,7 @@ UPDATE2() {
fi fi
[[ "$useAutoremove" -ne 0 ]] && AUTOREMOVE [[ "$useAutoremove" -ne 0 ]] && AUTOREMOVE
[ -f ${NM_FOLDER}/conf/defaults.local.inc ] && /usr/local/bin/nmg skip on
${APTFUNC} upgrade -y ${APTFUNC} upgrade -y
${APTFUNC} dist-upgrade ${APTFUNC} dist-upgrade
@@ -54,9 +64,18 @@ UPDATE2() {
touch "${FOLDER}/lastrun" touch "${FOLDER}/lastrun"
echo echo
echo -e "${idsCL[Green]}Updated Upgrades have completed${idsCL[Default]}" echo -e "${idsCL[Green]}Updates have completed${idsCL[Default]}"
[ ${action-x} ] && exit 0 [ ${action-x} ] && exit 0
ENTER2CONTINUE if [ -f ${NM_FOLDER}/conf/defaults.local.inc ]; then
echo
read -n 1 -p "Would you like to disable NMG SKIP and reboot right away (Y/n)?" choice
case "$choice" in
[Nn]) tmp=temp;;
* ) /usr/local/bin/nmg skip reboot;;
esac
else
ENTER2CONTINUE
fi
} }
UPDATE3() { UPDATE3() {
restart_flag=''; restart_flag='';
@@ -83,6 +102,7 @@ UPDATE3() {
fi fi
[[ "$useAutoremove" -ne 0 ]] && AUTOREMOVE >> /opt/runupdates.log [[ "$useAutoremove" -ne 0 ]] && AUTOREMOVE >> /opt/runupdates.log
${APTFUNC} update >> /opt/runupdates.log ${APTFUNC} update >> /opt/runupdates.log
[ -f ${NM_FOLDER}/conf/defaults.local.inc ] && /usr/local/bin/nmg skip on >> /opt/runupdates.log
${APTFUNC} upgrade -y >> /opt/runupdates.log ${APTFUNC} upgrade -y >> /opt/runupdates.log
[[ "$useAutoremove" -ne 0 ]] && AUTOREMOVE >> /opt/runupdates.log [[ "$useAutoremove" -ne 0 ]] && AUTOREMOVE >> /opt/runupdates.log
@@ -96,7 +116,7 @@ UPDATE3() {
if [ "$autorun_restart_after" = true ] || [ "$restart_flag" = true ]; then if [ "$autorun_restart_after" = true ] || [ "$restart_flag" = true ]; then
echo -e "${BOrange}Rebooting now...${idsCL[Default]}" echo -e "${BOrange}Rebooting now...${idsCL[Default]}"
sleep 3 sleep 3
/sbin/shutdown -r now [ -f ${NM_FOLDER}/conf/defaults.local.inc ] && /usr/local/bin/nmg skip reboot >> /opt/runupdates.log
fi fi
exit 0 exit 0
} }