xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-28 20:39:40 +00:00
Code Issues Projects Releases Wiki Activity

Fix imgutil profile path and osdeploy diskless layout

Browse Source
This commit is contained in:
Jarrod Johnson 2021-06-15 08:00:09 -04:00
parent 1d148afd70
commit 62ac393721
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
confluent_osdeploy/confluent_osdeploy.spec.tmpl
View File

@ -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

2
imgutil/imgutil
View File

@ -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])