xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-12-23 19:52:10 +00:00
Code Issues Projects Releases Wiki Activity

Fix ubuntu profile name

Browse Source 
It was erroneously changed by
initprofile.sh
This commit is contained in:
Jarrod Johnson 2020-05-07 12:10:27 -04:00
parent f10bbdc33d
commit 471f3bd1cf
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
confluent_osdeploy/ubuntu20.04/profiles/default/initprofile.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
sed -i s/ubuntu/Ubuntu/ $2/profile.yaml && \
sed -i s/label: ubuntu/label: Ubuntu/ $2/profile.yaml && \
ln -s $1/casper/vmlinuz $2/boot/kernel && \
ln -s $1/casper/initrd $2/boot/initramfs/distribution && \
mkdir -p $2/boot/efi/boot && \

3
librarian/osimport
View File

@ -336,7 +336,6 @@ class MediaImporter(object):
while wkr.poll() is None:
currline += wkr.stdout.read(1)
if b'\r' in currline:
print(repr(currline))
currline = b''
a = wkr.stdout.read(1)
while a:
@ -368,7 +367,7 @@ class MediaImporter(object):
profdata = profdata.replace('%%DISTRO%%', osd)
profdata = profdata.replace('%%VERSION%%', osversion)
profdata = profdata.replace('%%ARCH%%', arch)
profdata = profdata.replacey('%%PROFILE%%', profname)
profdata = profdata.replace('%%PROFILE%%', profname)
if profdata:
with open('{0}/profile.yaml'.format(dirname), 'w') as yout:
yout.write(profdata)