Merge pull request #16308 from bluca/root_image_options

author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Mon, 3 Aug 2020 08:04:36 +0000 (10:04 +0200)

committer GitHub <noreply@github.com>

Mon, 3 Aug 2020 08:04:36 +0000 (10:04 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 3 Aug 2020 08:04:36 +0000 (10:04 +0200)
committer GitHub <noreply@github.com>
Mon, 3 Aug 2020 08:04:36 +0000 (10:04 +0200)
diff --cc src/core/namespace.c
Simple merge
diff --cc src/nspawn/nspawn.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Mon, 3 Aug 2020 08:04:36 +0000 (10:04 +0200)
committer	GitHub <noreply@github.com>
	Mon, 3 Aug 2020 08:04:36 +0000 (10:04 +0200)
		1	2
src/core/namespace.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/nspawn/nspawn.c	patch \|	diff1 \|	diff2 \|	blob \| history