[elbe-devel] [PATCH] initvm: Only copy gpg file if called with cdrom

[bage at linutronix.de]

From: Bastian Germann <bage at linutronix.de>

A gpg file is only available in this context if `elbe initvm create --cdrom=...`
is called. So move the copying to the right place to prevent error messages.

Closes issue #189.

Signed-off-by: Bastian Germann <bage at linutronix.de>
---
 elbepack/init/Makefile.mako | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/elbepack/init/Makefile.mako b/elbepack/init/Makefile.mako
index 8e98176e..0b4960e8 100644
--- a/elbepack/init/Makefile.mako
+++ b/elbepack/init/Makefile.mako
@@ -68,14 +68,14 @@ all: .stamps/stamp-install-initial-image
 	mkdir -p tmp-tree/usr/lib/post-base-installer.d
 	cp .elbe-in/init-elbe.sh tmp-tree/
 	cp .elbe-in/source.xml tmp-tree/
-	mkdir -p tmp-tree/usr/share/keyrings
-	-cp .elbe-in/*.gpg tmp-tree/usr/share/keyrings
 	cp .elbe-in/initrd-cdrom.gz tmp-tree/
 	cp .elbe-in/vmlinuz tmp-tree/
 % if opt.devel:
 	cp .elbe-in/elbe-devel.tar.bz2 tmp-tree/
 % endif
 % if opt.cdrom:
+	mkdir -p tmp-tree/usr/share/keyrings
+	-cp .elbe-in/*.gpg tmp-tree/usr/share/keyrings
 	mkdir -p tmp-tree/usr/lib/base-installer.d
 	echo 'mkdir -p /target/etc/apt/trusted.gpg.d/; cp /usr/share/keyrings/elbe-keyring.gpg /target/etc/apt/trusted.gpg.d/' > tmp-tree/usr/lib/base-installer.d/10copyelbekeyring
 	chmod 755 tmp-tree/usr/lib/base-installer.d/*
-- 
2.11.0