xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2026-01-10 01:52:31 +00:00
Code Issues Projects Releases Wiki Activity

Tolerate updateboot failure on first import

Browse Source
This commit is contained in:
Jarrod Johnson
2025-09-04 10:21:01 -04:00
parent 87a6891eff
commit 29c6ce230f
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
confluent_server/confluent/osimage.py
View File

@@ -72,7 +72,7 @@ def symlink(src, targ):
raise
def update_boot(profilename):
def update_boot(profilename, initialimport=False):
if profilename.startswith('/var/lib/confluent/public'):
profiledir = profilename
else:
@@ -90,15 +90,20 @@ def update_boot(profilename):
elif ostype == 'esxi':
update_boot_esxi(profiledir, profile, label)
elif ostype == 'windows':
update_boot_windows(profiledir, profile, label)
update_boot_windows(profiledir, profile, label, initialimport)
def update_boot_windows(profiledir, profile, label):
def update_boot_windows(profiledir, profile, label, initialimport):
profname = os.path.basename(profiledir)
subprocess.check_call(
['/usr/bin/genisoimage', '-o',
'{0}/boot.img'.format(profiledir), '-udf', '-b', 'dvd/etfsboot.com',
'-no-emul-boot', '-eltorito-alt-boot', '-eltorito-boot',
'dvd/efisys_noprompt.bin', '{0}/boot'.format(profiledir)], preexec_fn=relax_umask)
try:
subprocess.check_call(
['/usr/bin/genisoimage', '-o',
'{0}/boot.img'.format(profiledir), '-udf', '-b', 'dvd/etfsboot.com',
'-no-emul-boot', '-eltorito-alt-boot', '-eltorito-boot',
'dvd/efisys_noprompt.bin', '{0}/boot'.format(profiledir)], preexec_fn=relax_umask)
except Exception:
if initialimport:
return
raise
def update_boot_esxi(profiledir, profile, label):
profname = os.path.basename(profiledir)
@@ -1090,7 +1095,7 @@ def generate_stock_profiles(defprofile, distpath, targpath, osname,
subprocess.check_call(
['sh', '{0}/initprofile.sh'.format(dirname),
targpath, dirname])
bootupdates.append(eventlet.spawn(update_boot, dirname))
bootupdates.append(eventlet.spawn(update_boot, dirname, True))
profilelist.append(profname)
for upd in bootupdates:
upd.wait()