Merge pull request #2879 from alexlarsson/composefs-new-signature-approach

author Alexander Larsson <alexl@redhat.com>

Sat, 10 Jun 2023 15:36:03 +0000 (17:36 +0200)

committer GitHub <noreply@github.com>

Sat, 10 Jun 2023 15:36:03 +0000 (17:36 +0200)
author Alexander Larsson <alexl@redhat.com>
Sat, 10 Jun 2023 15:36:03 +0000 (17:36 +0200)
committer GitHub <noreply@github.com>
Sat, 10 Jun 2023 15:36:03 +0000 (17:36 +0200)
diff --cc src/switchroot/ostree-mount-util.h
Simple merge
diff --cc src/switchroot/ostree-prepare-root.c
Simple merge
author	Alexander Larsson <alexl@redhat.com>
	Sat, 10 Jun 2023 15:36:03 +0000 (17:36 +0200)
committer	GitHub <noreply@github.com>
	Sat, 10 Jun 2023 15:36:03 +0000 (17:36 +0200)
		1	2
src/switchroot/ostree-mount-util.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/switchroot/ostree-prepare-root.c	patch \|	diff1 \|	diff2 \|	blob \| history