buildextend-installer: drop --no-pxe option
We're going to be implementing the ISO image in terms of the rootfs,
so this option will no longer provide any savings.
@@ -48,8 +48,6 @@ parser.add_argument("--force", action='store_true', default=False,
help="Overwrite previously generated installer")
parser.add_argument("--legacy-pxe", action='store_true', default=False,
help="Generate stub PXE rootfs image")
-parser.add_argument("--no-pxe", action='store_true', default=False,
- help="Do not generate PXE media")
args = parser.parse_args()
# Identify the builds and target the latest build if none provided
@@ -249,7 +247,6 @@ def generate_iso():
run_verbose(['/usr/lib/coreos-assembler/osmet-pack',
img_metal4k, '4096', tmp_osmet4k, img_metal4k_checksum,
'fast' if args.fast else 'normal'])
- if not args.no_pxe:
cp_reflink(tmp_osmet, os.path.join(tmpinitrd_pxe_or_rootfs, os.path.basename(tmp_osmet)))
cp_reflink(tmp_osmet4k, os.path.join(tmpinitrd_pxe_or_rootfs, os.path.basename(tmp_osmet4k)))
@@ -260,14 +257,12 @@ def generate_iso():
tmp_squashfs = os.path.join(tmpisoroot, 'root.squashfs')
run_verbose(['/usr/lib/coreos-assembler/gf-mksquashfs',
img_metal, tmp_squashfs, squashfs_compression])
- if not args.no_pxe:
cp_reflink(tmp_squashfs, os.path.join(tmpinitrd_pxe_or_rootfs, 'root.squashfs'))
# Generate initramfses
# Add common content
iso_initramfs = os.path.join(tmpisoimages, initramfs_img)
extend_initrd(iso_initramfs, tmpinitrd_base)
- if not args.no_pxe:
# Clone to PXE image
pxe_initramfs = os.path.join(tmpdir, initramfs_img)
cp_reflink(iso_initramfs, pxe_initramfs)
@@ -502,7 +497,6 @@ def generate_iso():
})
shutil.move(tmpisofile, f"{builddir}/{iso_name}")
- if not args.no_pxe:
kernel_name = f'{base_name}-{args.build}-{image_type}-kernel-{basearch}'
initramfs_name = f'{base_name}-{args.build}-{image_type}-initramfs.{basearch}.img'
kernel_file = os.path.join(builddir, kernel_name)
