xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-22 09:32:21 +00:00
Code Issues Projects Releases Wiki Activity

Create private directiories and correct key format

Browse Source
This commit is contained in:
Jarrod Johnson 2021-07-23 17:43:47 -04:00
parent 7f468c3a91
commit 4928f50332
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
imgutil/imgutil
View File

@ -164,7 +164,10 @@ def capture_remote(opts, args):
sys.stdout.write('Transferring image...')
sys.stdout.flush()
subprocess.check_call(['rsync', '-a', '{0}:/run/imgutil/capout/'.format(targ), outdir])
oum = os.umask(0o077)
mkdirp(os.path.join(privdir, 'pending'))
subprocess.check_call(['rsync', '-a', '{0}:/run/imgutil/private.key'.format(targ), '{}/pending/rootimg.key'.format(privdir)])
os.umask(oum)
sys.stdout.write('Done\n')
sys.stdout.flush()
subprocess.check_call(['ssh', '-t', targ, 'python3', '/run/imgutil/capenv/imgutil', 'capturelocalcleanup'])
@ -291,8 +294,10 @@ def encrypt_image(plainfile, cryptfile, keyfile):
while chunk:
cryptout.write(chunk)
chunk = plainin.read(65536)
oum = os.umask(0o077)
with open(keyfile, 'w') as keyout:
keyout.write(key)
keyout.write('aes-xts-plain64\n{}\n'.format(key))
os.umask(oum)
@ -753,6 +758,7 @@ def pack_image(opts, args):
initrdname = os.path.join(args[0], 'boot/initramfs-{0}.img'.format(mostrecent))
if not os.path.exists(initrdname):
initrdname = os.path.join(args[0], 'boot/initrd-{0}'.format(mostrecent))
mkdirp(os.path.join(privdir, 'pending/'))
mkdirp(os.path.join(outdir, 'boot/efi/boot'))
mkdirp(os.path.join(outdir, 'boot/initramfs'))
profname = os.path.basename(outdir)