From fa3220f3d1207fb130a74a5ea90306cdd7e36607 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 4 Jun 2021 17:45:52 -0400 Subject: [PATCH] Actually fix up the osdeploy build For now, stub out the diskless profile dir, which doesn't quite exist yet. --- confluent_osdeploy/confluent_osdeploy.spec.tmpl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/confluent_osdeploy/confluent_osdeploy.spec.tmpl b/confluent_osdeploy/confluent_osdeploy.spec.tmpl index d12106ea..af9f324b 100644 --- a/confluent_osdeploy/confluent_osdeploy.spec.tmpl +++ b/confluent_osdeploy/confluent_osdeploy.spec.tmpl @@ -41,7 +41,8 @@ for os in el8; do mkdir ${os}disklessout cd ${os}disklessout cp -a ../opt . - cp -a ../${os}-diskless/initramfs/* . + #TODO: actually have el8 stateless content + #cp -a ../${os}-diskless/initramfs/* . cp -a ../common/* . cp -a ../stateless-bin/* opt/confluent/bin find . | cpio -H newc -o > ../addons.cpio @@ -66,7 +67,7 @@ for os in rhvh4 el7 el8 genesis suse15 ubuntu20.04 esxi6 esxi7 coreos; do mkdir -p %{buildroot}/opt/confluent/lib/osdeploy/$os/profiles cp ${os}out/addons.* %{buildroot}/opt/confluent/lib/osdeploy/$os/initramfs if [ -d ${os}disklessout ]; then - mkdir -p %{buildroot}/opt/confluent/lib/osdeploy/${os}diskless/initramfs + mkdir -p %{buildroot}/opt/confluent/lib/osdeploy/${os}-diskless/initramfs cp ${os}disklessout/addons.* %{buildroot}/opt/confluent/lib/osdeploy/${os}-diskless/initramfs fi cp -a $os/profiles/* %{buildroot}/opt/confluent/lib/osdeploy/$os/profiles