From 62ac393721aa75cd4e436efba2ca04f393ba5334 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 15 Jun 2021 08:00:09 -0400 Subject: [PATCH] Fix imgutil profile path and osdeploy diskless layout --- confluent_osdeploy/confluent_osdeploy.spec.tmpl | 1 + imgutil/imgutil | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/confluent_osdeploy/confluent_osdeploy.spec.tmpl b/confluent_osdeploy/confluent_osdeploy.spec.tmpl index c29b91ff..293d956f 100644 --- a/confluent_osdeploy/confluent_osdeploy.spec.tmpl +++ b/confluent_osdeploy/confluent_osdeploy.spec.tmpl @@ -68,6 +68,7 @@ for os in rhvh4 el7 el8 genesis suse15 ubuntu20.04 esxi6 esxi7 coreos; do cp -a $os/profiles/* %{buildroot}/opt/confluent/lib/osdeploy/$os/profiles if [ -d ${os}disklessout ]; then mkdir -p %{buildroot}/opt/confluent/lib/osdeploy/${os}-diskless/initramfs + mkdir -p %{buildroot}/opt/confluent/lib/osdeploy/${os}-diskless/profiles cp ${os}disklessout/addons.* %{buildroot}/opt/confluent/lib/osdeploy/${os}-diskless/initramfs cp -a ${os}-diskless/profiles/* %{buildroot}/opt/confluent/lib/osdeploy/$os-diskless/profiles fi diff --git a/imgutil/imgutil b/imgutil/imgutil index 6418cacb..9ff7954e 100644 --- a/imgutil/imgutil +++ b/imgutil/imgutil @@ -373,7 +373,7 @@ def pack_image(opts, args): os.symlink('{}/initramfs/addons.cpio'.format(confdir), os.path.join(outdir, 'boot/initramfs/addons.cpio')) if os.path.exists('{}/profiles/default'.format(confdir)): - shutil.copytree('{}/profiles/default', outdir) + shutil.copytree('{}/profiles/default'.format(confdir), outdir) try: pwd.getpwnam('confluent') subprocess.check_call(['chown', '-R', 'confluent', outdir])