xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-01-13 11:17:49 +00:00
Code Issues Projects Releases Wiki Activity

Fixes for imgutil

Browse Source
This commit is contained in:
Jarrod Johnson 2021-08-26 16:03:17 -04:00
parent d4a846e786
commit f2fcbc887d
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
imgutil/imgutil
View File

@ -358,7 +358,9 @@ def create_yumconf(sourcedir, addrepos):
yumconf.write('enabled=1\ngpgcheck=0\n\n')
addrepoidx = 1
for repo in addrepos.split(','):
yumconf.write('[addrepo-{0}]\n', addrepoidx)
if not repo:
continue
yumconf.write('[addrepo-{0}]\n'.format(addrepoidx))
yumconf.write('name=Add-on repository {0}\n'.format(addrepoidx))
yumconf.write('baseurl={0}\n'.format(repo))
yumconf.write('enabled=1\ngpgcheck\0\n\n')
@ -708,13 +710,6 @@ def check_root(installroot):
# Ensure that the target is an adequate filesystem to
# be root
mkdirp(installroot)
testpath = os.path.join(installroot, '.testcap')
with open(testpath, 'w') as tp:
tp.write('')
try:
subprocess.check_call(['setcap', 'cap_net_raw+p', testpath])
finally:
os.remove(testpath)
def fingerprint_source_suse(files, sourcepath, args):