diff --git a/genesis/97genesis/install-base b/genesis/97genesis/install-base index d49d9556..d905770c 100644 --- a/genesis/97genesis/install-base +++ b/genesis/97genesis/install-base @@ -1,7 +1,9 @@ #!/bin/sh -dracut_install /usr/bin/clevis-encrypt-tpm2 /usr/bin/clevis-decrypt-tpm2 /usr/bin/jose /usr/bin/mktemp +dracut_install mktemp dracut_install /lib64/libtss2-tcti-device.so.0 -dracut_install /usr/bin/tpm2_create /usr/bin/tpm2_pcrread /usr/bin/tpm2_createpolicy /usr/bin/tpm2_createprimary /usr/bin/tpm2_load /usr/bin/tpm2_unseal +dracut_install tpm2_create tpm2_pcrread tpm2_createpolicy tpm2_createprimary +dracut_install tpm2_load tpm2_unseal tpm2_getcap tpm2_evictcontrol +dracut_install tpm2_pcrextend tpm2_policypcr tpm2_flushcontext tpm2_startauthsession dracut_install curl openssl tar ipmitool cpio xz gzip lsmod ethtool dracut_install modprobe touch echo cut wc bash netstat uniq grep ip hostname dracut_install awk egrep dirname bc expr sort diff --git a/imgutil/imgutil b/imgutil/imgutil index 30185752..e8d4e24c 100644 --- a/imgutil/imgutil +++ b/imgutil/imgutil @@ -328,11 +328,13 @@ def check_root(installroot): def fingerprint_source_suse(files, sourcepath): if os.path.exists(os.path.join(sourcepath, 'distinfo.yaml')): - with open(os.path.join(sourcepath, 'distinfo.yaml', 'r')) as distinfo: + with open(os.path.join(sourcepath, 'distinfo.yaml'), 'r') as distinfo: di = distinfo.read() issuse = False osname, ver, arch = (None, None, None) for line in di.split('\n'): + if ': ' not in line: + continue key, val = line.split(': ') if key == 'category' and val == 'suse15': issuse = True