Fix: Don't apply if snapshot is current already

openSUSE · Jan 13, 2025 · 9456f6e · 9456f6e
1 parent 1535402
commit 9456f6e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/sbin/transactional-update.in b/sbin/transactional-update.in
@@ -321,7 +321,7 @@ teardown() {
 }
 
 do_apply() {
-    if [ -n "${SNAPSHOT_ID}" -o -n "${ROLLBACK_SNAPSHOT}" -o "${DEFAULT_SNAPSHOT_ID}" != "${CURRENT_SNAPSHOT_ID}" ]; then
+    if [ -n "${SNAPSHOT_ID}" -o "${ROLLBACK_SNAPSHOT}" -ne 0 -o "${DEFAULT_SNAPSHOT_ID}" != "${CURRENT_SNAPSHOT_ID}" ]; then
 	NEW_DEFAULT_SNAPSHOT_ID=`btrfs subvolume get-default / | sed -e 's|.*.snapshots/\(.*\)/snapshot|\1|g'`
 	if ! APPLYWORKDIR="$(mktemp -d /tmp/transactional-update.apply.XXXXXXXX)"; then
 	    log_error "ERROR during apply: Temporary directory template failed."