Tweak sysupgrade's verbosity:
* If we are verifying old sets, say so. This is not an instaneous
operation.
* Only say that we are verifying the (newly downloaded) sets, if
we're actually doing so.
OK?
# rm /home/_sysupgrade/x*.tgz
# sysupgrade -knf
SHA256.sig 100% |*************************************| 2141 00:00
Signature Verified
Verifying old sets.
xbase65.tgz 100% |*************************************| 20108 KB 00:03
xfont65.tgz 100% |*************************************| 39342 KB 00:07
xserv65.tgz 100% |*************************************| 16341 KB 00:03
xshare65.tgz 100% |*************************************| 4460 KB 00:01
Verifying sets.
Will upgrade on next reboot
# sysupgrade -knf
SHA256.sig 100% |*************************************| 2141 00:00
Signature Verified
Verifying old sets.
Will upgrade on next reboot
Index: sysupgrade.sh
===================================================================
RCS file: /cvs/src/usr.sbin/sysupgrade/sysupgrade.sh,v
retrieving revision 1.18
diff -u -p -r1.18 sysupgrade.sh
--- sysupgrade.sh 9 May 2019 21:09:37 -0000 1.18
+++ sysupgrade.sh 9 May 2019 21:36:44 -0000
@@ -162,7 +162,8 @@ OLD_FILES=$(ls)
OLD_FILES=$(rmel SHA256 $OLD_FILES)
DL=$SETS
-for f in $SETS; do
+[[ -n ${OLD_FILES} ]] && echo Verifying old sets.
+for f in ${OLD_FILES}; do
if cksum -C SHA256 $f >/dev/null 2>&1; then
DL=$(rmel $f ${DL})
OLD_FILES=$(rmel $f ${OLD_FILES})
@@ -174,8 +175,10 @@ for f in ${DL}; do
unpriv -f $f ftp -Vmo ${f} ${URL}${f}
done
-echo Verifying sets.
-[[ -n ${DL} ]] && unpriv cksum -qC SHA256 ${DL}
+if [[ -n ${DL} ]]; then
+ echo Verifying sets.
+ unpriv cksum -qC SHA256 ${DL}
+fi
${KEEP} && > keep
--
Christian "naddy" Weisgerber [email protected]
