buildextend-live: always enable miniso
Now that we have coreos-installer v0.11.0 in cosa, we can drop the
`--miniso` switch and always turn it on. The only place which used it is
the coreos-installer CI, which will stop using it once this is merged.
Patch best viewed with whitespace ignored.
Closes:
@@ -36,8 +36,6 @@ parser.add_argument("--fast", action='store_true', default=False,
help="Reduce compression for development (FCOS only)")
parser.add_argument("--force", action='store_true', default=False,
help="Overwrite previously generated installer")
-parser.add_argument("--miniso", action='store_true', default=False,
- help="Enable minimal ISO packing (temporary)")
args = parser.parse_args()
# Identify the builds and target the latest build if none provided
@@ -581,7 +579,6 @@ boot
# Define inputs and outputs
genisoargs_final = genisoargs + ['-o', tmpisofile, tmpisoroot]
- if args.miniso:
miniso_data = os.path.join(tmpisocoreos, "miniso.dat")
with open(miniso_data, 'wb') as f:
f.truncate(miniso_data_file_size)
@@ -593,7 +590,6 @@ boot
if basearch == "x86_64":
run_verbose(['/usr/bin/isohybrid', '--uefi', tmpisofile])
- if args.miniso:
genisoargs_minimal = genisoargs + ['-o', f'{tmpisofile}.minimal', tmpisoroot]
# The only difference with the miniso is that we drop these two files.
# Keep everything else the same to maximize file matching between the
@@ -676,7 +672,6 @@ boot
isofh.write(struct.pack(INITRDFMT, b'coreiso+', offset, ignition_img_size))
print(f'Embedded {ignition_img_size} bytes Ignition config space at {offset}')
- if args.miniso:
# this consumes the minimal image
run_verbose(['coreos-installer', 'iso', 'extract', 'pack-minimal-iso',
tmpisofile, f'{tmpisofile}.minimal', "--consume"])
