From 7b9fc657df37cd545b21bd3dd37e58f0560e6461 Mon Sep 17 00:00:00 2001
From: Marius Vollmer <marius.vollmer@gmail.com>
Date: Thu, 19 Dec 2024 12:38:20 +0200
Subject: [PATCH] Revert "test: Make restore_dir() work for OSTree images"

This reverts commit 413111f230ccabaaded2b63f081472ffedd3fccd.

We don't need this anymore since overrides are in /etc.

Letting restore_dir work on OSTree images might cause the destructive
tests TestServices.testBasic and TestServices.testLogs and maybe
others to be flaky.
---
 test/common/testlib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/common/testlib.py b/test/common/testlib.py
index 1708b02dad6a..bb50dda672e4 100644
--- a/test/common/testlib.py
+++ b/test/common/testlib.py
@@ -2360,7 +2360,7 @@ def restore_dir(
         If the directory needs to survive reboot, `reboot_safe=True` needs to be specified; then this
         will just backup/restore the directory instead of bind-mounting, which is less robust.
         """
-        if not self.is_nondestructive() and not self.machine.ostree_image:
+        if not self.is_nondestructive():
             return  # skip for efficiency reasons
 
         exe = self.machine.execute