From 9eb2686fd580348a9f9db1bd4d8fba05d7749e28 Mon Sep 17 00:00:00 2001 From: Kevin Olbrich Date: Wed, 31 Jan 2024 13:26:33 +0100 Subject: [PATCH] so not write mtab for bookworm builds as this is now allowed --- bootstrapvz/providers/kvm/__init__.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bootstrapvz/providers/kvm/__init__.py b/bootstrapvz/providers/kvm/__init__.py index 2674f4f..3a98d94 100644 --- a/bootstrapvz/providers/kvm/__init__.py +++ b/bootstrapvz/providers/kvm/__init__.py @@ -1,5 +1,5 @@ from bootstrapvz.common import task_groups -from bootstrapvz.common.tasks import image, loopback, initd, ssh, logicalvolume +from bootstrapvz.common.tasks import image, loopback, initd, ssh, logicalvolume, filesystem from .tasks import packages, boot @@ -35,11 +35,16 @@ def resolve_tasks(taskset, manifest): if manifest.provider['console'] == 'virtual': taskset.update([boot.SetGrubConsolOutputDeviceToVirtual]) - from bootstrapvz.common.releases import jessie + from bootstrapvz.common.releases import jessie, bookworm if manifest.release >= jessie: taskset.update([boot.SetGrubConsolOutputDeviceToVirtual, boot.SetSystemdTTYVTDisallocate, ]) + if manifest.release >= bookworm: + if filesystem.CopyMountTable in taskset: + taskset.remove(filesystem.CopyMountTable) + if filesystem.RemoveMountTable in taskset: + taskset.remove(filesystem.RemoveMountTable) def resolve_rollback_tasks(taskset, manifest, completed, counter_task):