update: only print what matters

gkaldera · Oct 8, 2017 · c2810c4 · c2810c4
1 parent 633a82d
commit c2810c4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/update/opnsense-update.sh b/update/opnsense-update.sh
@@ -301,13 +301,15 @@ fi
 
 if [ -z "${DO_FORCE}" ]; then
 	# disable kernel if locked
-	if [ -n "${LOCKED_KERNEL}" -a -z "${DO_UPGRADE}" ]; then
+	if [ -n "${DO_KERNEL}" -a -n "${LOCKED_KERNEL}" -a \
+	    -z "${DO_UPGRADE}" ]; then
 		echo "Kernel locked, skipping."
 		DO_KERNEL=
 	fi
 
 	# disable base if locked
-	if [ -n "${LOCKED_BASE}" -a -z "${DO_UPGRADE}" ]; then
+	if [ -n "${DO_BASE}" -a -n "${LOCKED_BASE}" -a \
+	    -z "${DO_UPGRADE}" ]; then
 		echo "Base locked, skipping."
 		DO_BASE=
 	fi