From 2645225e11ff80d891dc7e964b4851b2468a40db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= Date: Tue, 13 Feb 2024 09:27:31 +0100 Subject: [PATCH] Fix setup of UUID for btrfs When setting up the UUID for a btrfs filesystem via btrfstune it could happen that the call becomes interactive asking a question and give a recommendation. All this is unwanted and can be forced via the -f switch. This Fixes #2456 --- kiwi/filesystem/btrfs.py | 2 +- test/unit/filesystem/btrfs_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kiwi/filesystem/btrfs.py b/kiwi/filesystem/btrfs.py index a152133fb3d..831ef90b901 100644 --- a/kiwi/filesystem/btrfs.py +++ b/kiwi/filesystem/btrfs.py @@ -67,5 +67,5 @@ def set_uuid(self): """ device = self.device_provider.get_device() Command.run( - ['btrfstune', '-u', device] + ['btrfstune', '-f', '-u', device] ) diff --git a/test/unit/filesystem/btrfs_test.py b/test/unit/filesystem/btrfs_test.py index 1254dfb53ab..2bbbc0f8065 100644 --- a/test/unit/filesystem/btrfs_test.py +++ b/test/unit/filesystem/btrfs_test.py @@ -37,5 +37,5 @@ def test_create_on_device(self, mock_command): def test_set_uuid(self, mock_command): self.btrfs.set_uuid() mock_command.assert_called_once_with( - ['btrfstune', '-u', '/dev/foo'] + ['btrfstune', '-f', '-u', '/dev/foo'] )