diff --git a/.gitignore b/.gitignore index ed91328..4ca59af 100644 --- a/.gitignore +++ b/.gitignore @@ -229,8 +229,42 @@ /lorax-38.4.tar.gz /lorax-38.5.tar.gz /lorax-38.6.tar.gz -/lorax-38.8.tar.gz -/lorax-38.9.tar.gz -/lorax-38.10.tar.gz -/lorax-38.11.tar.gz -/lorax-38.12.tar.gz +/lorax-39.0.tar.gz +/lorax-39.1.tar.gz +/lorax-39.2.tar.gz +/lorax-39.3.tar.gz +/lorax-39.4.tar.gz +/lorax-39.5.tar.gz +/lorax-40.0.tar.gz +/lorax-40.1.tar.gz +/lorax-40.2.tar.gz +/lorax-40.3.tar.gz +/lorax-40.4.tar.gz +/lorax-40.5.tar.gz +/lorax-40.6.tar.gz +/lorax-41.0.tar.gz +/lorax-41.1.tar.gz +/lorax-41.2.tar.gz +/lorax-41.3.tar.gz +/lorax-42.0.tar.gz +/lorax-42.1.tar.gz +/lorax-42.2.tar.gz +/lorax-42.3.tar.gz +/lorax-42.4.tar.gz +/lorax-42.5.tar.gz +/lorax-43.0.tar.gz +/lorax-43.1.tar.gz +/lorax-43.2.tar.gz +/lorax-43.3.tar.gz +/lorax-43.4.tar.gz +/lorax-43.5.tar.gz +/lorax-43.6.tar.gz +/lorax-43.7.tar.gz +/lorax-43.8.tar.gz +/lorax-43.9.tar.gz +/lorax-43.10.tar.gz +/lorax-44.0.tar.gz +/lorax-44.1.tar.gz +/lorax-44.2.tar.gz +/lorax-44.3.tar.gz +/lorax-44.4.tar.gz diff --git a/lorax.spec b/lorax.spec index 04daee5..5e3eaa4 100644 --- a/lorax.spec +++ b/lorax.spec @@ -1,26 +1,32 @@ # NOTE: This specfile is generated from upstream at https://github.com/rhinstaller/lorax # NOTE: Please submit changes as a pull request %define debug_package %{nil} +%global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 38.12 +Version: 44.4 Release: 1%{?dist} Summary: Tool for creating the anaconda install images - License: GPL-2.0-or-later -URL: https://github.com/weldr/lorax -# To generate Source0 do: -# git clone https://github.com/weldr/lorax -# git checkout -b archive-branch lorax-%%{version}-%%{release} -# tito build --tgz -Source0: %{name}-%{version}.tar.gz + +# qemu is no longer available on 32-bit +ExcludeArch: %{ix86} + +%global tag %{version} +%forgemeta +Url: %{forgeurl} +Source0: %{forgesource} BuildRequires: python3-devel +BuildRequires: python3-pip BuildRequires: python3-setuptools BuildRequires: make BuildRequires: systemd-rpm-macros Requires: lorax-templates +%if 0%{?rhel} >= 9 +Requires: lorax-templates-rhel +%endif Requires: cpio Requires: device-mapper @@ -37,6 +43,7 @@ Requires: isomd5sum Requires: module-init-tools Requires: parted Requires: squashfs-tools >= 4.2 +Requires: erofs-utils >= 1.8.2 Requires: util-linux Requires: xz-lzma-compat Requires: xz @@ -50,7 +57,7 @@ Requires: psmisc Requires: libselinux-python3 Requires: python3-mako Requires: python3-kickstart >= 3.19 -Requires: python3-dnf >= 3.2.0 +Requires: python3-libdnf5 Requires: python3-librepo Requires: python3-pycdio @@ -89,19 +96,29 @@ Requires: lorax = %{version}-%{release} %description docs Includes the full html documentation for lorax, livemedia-creator, and the pylorax library. +%if ! (0%{?rhel} >= 10 && "%{_arch}" == "ppc64le") %package lmc-virt Summary: livemedia-creator libvirt dependencies Requires: lorax = %{version}-%{release} +%if 0%{?rhel} +# RHEL doesn't have qemu, just qemu-kvm +Requires: qemu-kvm +%else Requires: qemu +Recommends: qemu-kvm +%endif -# Fedora edk2 builds currently only support these arches -%ifarch x86_64 aarch64 +# edk2 builds currently only support these arches +%ifarch x86_64 Requires: edk2-ovmf %endif -Recommends: qemu-kvm +%ifarch aarch64 +Requires: edk2-aarch64 +%endif %description lmc-virt Additional dependencies required by livemedia-creator when using it with qemu. +%endif %package lmc-novirt Summary: livemedia-creator no-virt dependencies @@ -126,7 +143,7 @@ Lorax templates for creating the boot.iso and live isos are placed in /usr/share/lorax/templates.d/99-generic %prep -%autosetup -p1 -n %{name}-%{version} +%forgeautosetup %build @@ -141,10 +158,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %doc docs/lorax.rst docs/livemedia-creator.rst docs/product-images.rst %doc docs/*ks %{python3_sitelib}/pylorax -%{python3_sitelib}/*.egg-info -%{_sbindir}/lorax -%{_sbindir}/mkefiboot -%{_sbindir}/livemedia-creator +%{python3_sitelib}/pylorax-%{version}.dist-info +%{_bindir}/lorax +%{_bindir}/mkefiboot +%{_bindir}/livemedia-creator %{_bindir}/mkksiso %{_bindir}/image-minimizer %dir %{_sysconfdir}/lorax @@ -159,7 +176,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %files docs %doc docs/html/* +%if ! (0%{?rhel} >= 10 && "%{_arch}" == "ppc64le") %files lmc-virt +%endif %files lmc-novirt @@ -168,24 +187,249 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Wed Aug 09 2023 Brian C. Lane 38.12-1 +* Mon Dec 01 2025 Brian C. Lane 44.4-1 +- Exclude build on the i686 architecture (berrange@redhat.com) +- runtime-cleanup: mesa no longer includes gallium-pipe drivers (yselkowi@redhat.com) + +* Wed Nov 26 2025 Daniel P. Berrangé - 44.3-2 +- Add ExcludeArch for i686 to remove qemu dependency + +* Wed Oct 15 2025 Brian C. Lane 44.3-1 +- Do not remove SELinux from the runtime (ppolawsk@redhat.com) + +* Thu Oct 09 2025 Brian C. Lane 44.2-1 +- Add mac80211_hwsim for wifi testing to installer image (rvykydal@redhat.com) +- runtime-install: drop tigervnc (awilliam@redhat.com) + +* Wed Sep 24 2025 Brian C. Lane 44.1-1 +- runtime-install: skip qcom-accel-firmware (awilliam@redhat.com) +- executils: decoding after deserialization (oleg.sviridov@red-soft.ru) +- mkksiso: make ISO reproducible with SOURCE_DATE_EPOCH (e.champetier@ateme.com) + +* Mon Sep 08 2025 Brian C. Lane 44.0-1 +- maint: Switch default platform to F44 (bcl@redhat.com) +- Drop all installs of shim-ia32 (it no longer exists) (awilliam@redhat.com) +- templates: Support product version to contain blank character in + templates.d/99-generic (songmingliang@uniontech.com) + +* Thu Aug 14 2025 Brian C. Lane 43.10-1 +- executils: Remove binary_output flag (bcl@redhat.com) +- logging: Set encoding=UTF-8 on FileHandler (bcl@redhat.com) +- executils: Set encoding to UTF-8 for _run_program (bcl@redhat.com) +- tests: Add template runcmd unicode test (bcl@redhat.com) +- tests: Add some unicode to the executils tests (bcl@redhat.com) +- templates: Remove explicit installation of anaconda-widgets (k.koukiou@gmail.com) + +* Tue Jul 22 2025 Brian C. Lane 43.9-1 +- Makefile: Separate install and all targets (bcl@redhat.com) + +* Tue Jul 15 2025 Brian C. Lane 43.8-1 +- pylilnt: Drop old rules and ignore .tito (bcl@redhat.com) +- tito: Add support for tagging the version in pyproject.toml (bcl@redhat.com) +- lorax.spec: Update for pyproject.toml use (bcl@redhat.com) +- pyproject: Add cmdline scripts (bcl@redhat.com) +- bin: symlink to scripts from src/bin (bcl@redhat.com) +- Move cmdline scripts under pylorax.cmdline (bcl@redhat.com) +- pylorax: Move cmdline into a pylorax.cmdline module (bcl@redhat.com) +- pyproject: Add a pyproject.toml config file (bcl@redhat.com) +- Makefile: Stop running setup.py directly (bcl@redhat.com) + +* Fri Jul 11 2025 Brian C. Lane 43.7-1 +- runtime-cleanup: don't strip avahi-libs (awilliam@redhat.com) +- treebuilder: use fedora-eln-logos for ELN (yselkowi@redhat.com) + +* Wed Jul 02 2025 Brian C. Lane 43.6-1 +- config_files: Do not remove `chcon` in runtime cleanup (ppolawsk@redhat.com) +- use /mnt/sysroot PATH in profile (butirsky@gmail.com) +- fix chroot path in .bash_history (butirsky@gmail.com) + +* Mon Jun 16 2025 Brian C. Lane 43.5-1 +- templates.d: Remove libdir variable from templates (bcl@redhat.com) +- runtime-cleanup: Move rpm database cleanup to the end (bcl@redhat.com) + +* Tue May 06 2025 Brian C. Lane 43.4-1 +- runtime-postinstall: Remove root password (bcl@redhat.com) + Resolves: rhbz#2364082 +- tests: Update magic module usage (bcl@redhat.com) +- utils: Remove old filediff.py script (bcl@redhat.com) +- dnfbase: Use load_repos instead of update_and_load_enabled_repos (bcl@redhat.com) + Fixes #1464 + +* Mon Mar 31 2025 Brian C. Lane 43.3-1 +- config_files: Drop efi suffix from linuxefi and initrdefi in grub2-efi.cfg (bcl@redhat.com) +- runtime-install: only install amd-ucode-firmware on x86_64 (awilliam@redhat.com) +- runtime-install: exclude crust-firmware (awilliam@redhat.com) +- runtime-cleanup: drop more video and audio firmwares (awilliam@redhat.com) +- runtime-install: drop exceptions related to F38-era fw renames (awilliam@redhat.com) +- runtime-postinstall: allow pipewire to run as root (awilliam@redhat.com) + +* Tue Mar 25 2025 Brian C. Lane 43.2-1 +- spec: update lorax-lmc-virt dependencies (yselkowi@redhat.com) +- livemedia-creator: Set 0755 permission on / cpio overlay (bcl@redhat.com) + +* Mon Mar 10 2025 Brian C. Lane 43.1-1 +- runtime-postinstall: Remove systemd-gpt-auto-generator (bcl@redhat.com) + +* Thu Mar 06 2025 Brian C. Lane 43.0-1 +- maint: Switch default platform to F43 (bcl@redhat.com) +- runtime-cleanup: Leave stat binary (bcl@redhat.com) + +* Mon Feb 03 2025 Brian C. Lane 42.5-1 +- Remove sbin usage (bcl@redhat.com) +- mkksiso: Replace existing inst.ks on the iso (bcl@redhat.com) +- Dockerfile.test: Use fedora:latest instead of rawhide (bcl@redhat.com) +- mkksiso: Fix rebuilding the efiboot.img on some systems (bcl@redhat.com) +- Remove leftovers from xorg drop (jkonecny@redhat.com) + +* Fri Nov 22 2024 Brian C. Lane 42.4-1 +- runtime-cleanup: Newer glibc installs into /usr/lib64 (bcl@redhat.com) +- erofs: Change the erofs compression default to zstd (bcl@redhat.com) + +* Mon Oct 21 2024 Brian C. Lane 42.3-1 +- Update template for anaconda webui to start as user (adamkankovsky@gmail.com) +- tests: Fix mkksiso unit test (bcl@redhat.com) + +* Tue Oct 08 2024 Brian C. Lane 42.2-1 +- pylint: Print astroid version (bcl@redhat.com) +- Extend help for --updates and --ks parameters (jkonecny@redhat.com) +- Fix --updates the updates image wasn't loaded (jkonecny@redhat.com) + +* Mon Sep 30 2024 Brian C. Lane 42.1-1 +- templates: Drop dnf install (bcl@redhat.com) + +* Mon Sep 09 2024 Brian C. Lane 42.0-1 +- New lorax documentation - 41.3 (bcl@redhat.com) +- ltmpl: Remove * from docstring (bcl@redhat.com) +- docs: Update intersphinx and add _static dir (bcl@redhat.com) +- docs: Document --rootfs-type options (bcl@redhat.com) +- Adjust Lorax templates for Xorg to Wayland switch (jkonecny@redhat.com) +- creator: Change rootfs description to match cmdline argument (bcl@redhat.com) + +* Tue Jul 16 2024 Brian C. Lane 41.3-1 +- Accept but ignore the old --squashfs-only argument (awilliam@redhat.com) + +* Mon Jul 15 2024 Brian C. Lane 41.2-1 +- Prepare for the sbin merge (zbyszek@in.waw.pl) +- Add compression.erofs section to lorax.conf (bcl@redhat.com) +- Add erofs and erofs-ext4 support to --rootfs-type (bcl@redhat.com) +- Replace squashfs_only with rootfs_type (bcl@redhat.com) +- imgutils: Add mkerofs function and test (bcl@redhat.com) +- Implement --replace also for S390 (sebastian.stark@advantest.com) +- mkksiso: option --replace to replace arbitrary text in boot config. (sebastian.stark@advantest.com) +- spec: Drop forge tag lua tweak (bcl@redhat.com) + +* Wed Jun 12 2024 Brian C. Lane 41.1-1 +- livemedia-creator: Check for BIOS vs. UEFI qemu support (bcl@redhat.com) +- livemedia-creator: Enable s390x virt support (bcl@redhat.com) +- livemedia-creator: Make use of virtio devices more generic (bcl@redhat.com) +- Makefile: Turn off seccomp for test-in-podman (bcl@redhat.com) +- tests: Fix image_minimizer test dnf usage (bcl@redhat.com) +- creator: Fix pylint error in run_creator (bcl@redhat.com) +- New lorax documentation - 41.1 (bcl@redhat.com) +- docs: Add sphinx-reredirects and composer-cli redirect (bcl@redhat.com) +- New lorax documentation - 41.1 (bcl@redhat.com) +- spec: Switch to using the source from the github tag (bcl@redhat.com) +- workflows: Add missing branch names (bcl@redhat.com) +- runtime-cleanup: wget2-wget has replaced wget (yselkowi@redhat.com) +- Add a simple PR template reminder (bcl@redhat.com) + +* Fri Mar 15 2024 Brian C. Lane +- maint: Switch default platform to F41 (bcl@redhat.com) +- Add prefixdevname support to the boot.iso (rvykydal@redhat.com) + +* Mon Feb 19 2024 Brian C. Lane +- Add example use of lmc in github actions. (cjshowalter@alaska.edu) +- Require lorax-templates-rhel when building for ELN, CentOS Stream and RHEL (sgallagh@redhat.com) +- workflows: Switch to actions/checkout@v4 (bcl@redhat.com) +- dnfbase: Fix substitutions (bcl@redhat.com) + +* Tue Feb 06 2024 Brian C. Lane 40.5-1 +- New lorax documentation - 40.5 (bcl@redhat.com) +- maint: Switch default platform to F40 (bcl@redhat.com) +- runtime-cleanup: Update to cleanup more (akira@tagoh.org) +- runtime-install: Update font packages (akira@tagoh.org) + +* Thu Feb 01 2024 Brian C. Lane 40.4-1 +- mkksiso: Add support for adding an anaconda updates.img (jkonecny@redhat.com) +- runtime-install: drop kdump-anaconda-addon (awilliam@redhat.com) +- ltmpl: Handle installing provides with resolve_pkg_spec (bcl@redhat.com) +- s390: Escape volid before using it (bcl@redhat.com) +- aarch64: Escape volid before using it (bcl@redhat.com) +- runtime-install: drop retired pcmciautils (awilliam@redhat.com) +- runtime-install: wget2-wget has replaced wget (awilliam@redhat.com) +- runtime-cleanup: anaconda's new interface needs stdbuf (kkoukiou@redhat.com) +- ltmpl: Pass packages to add_rpm_install as strings (bcl@redhat.com) + +* Wed Dec 20 2023 Brian C. Lane 40.3-1 +- runtime-install: Work around problem with conflicting packages (bcl@redhat.com) +- ltmpl: Check for errors after running the transaction (bcl@redhat.com) + +* Tue Dec 12 2023 Brian C. Lane 40.2-1 +- ltmpl: Remove duplicate package objects from dnf5 results (bcl@redhat.com) +- test-in-podman: Fix problem running in github actions (bcl@redhat.com) + +* Mon Dec 11 2023 Brian C. Lane 40.1-1 +- ltmpl: Filter out other arches, clean up naming (bcl@redhat.com) +- test: Add pigz to test-packages (bcl@redhat.com) +- dnfbase: Fix url substitution support (bcl@redhat.com) +- ltmpl: Add transaction error handling (bcl@redhat.com) +- test-packages: Make sure python3-libdnf5 is installed (bcl@redhat.com) +- Updates for latest libdnf5 changes (bcl@redhat.com) +- spec: Switch to using python3-libdnf5 (bcl@redhat.com) +- Fix writing out debug info for package files and sizes (bcl@redhat.com) +- libdnf5: Switch lorax to use libdnf5 (bcl@redhat.com) +- Add python3-libdnf5 to the list of test packages (bcl@redhat.com) +- Adjust runtime-postinstall.tmpl for systemd config files move (zbyszek@in.waw.pl) + +* Mon Oct 02 2023 Brian C. Lane 40.0-1 +- Remove some unneccessary storage packages from runtime-install (vtrefny@redhat.com) +- Do not install polkit-gnome for blivet-gui (vtrefny@redhat.com) +- docs: Update the quickstart example command (vtrefny@redhat.com) + +* Thu Sep 07 2023 Brian C. Lane 39.5-1 +- Explicitly pull in more filesystem packages (awilliam@redhat.com) +- runtime-postinstall: Turn off lvm monitoring (bcl@redhat.com) +- runtime-cleanup.tmpl: fix typo 'gschadow' (chris.riches@nutanix.com) +- runtime-cleanup: Change how logo pixmaps is cleaned up (bcl@redhat.com) +- runtime-install: only pull in qcom-firmware on aarch64 (awilliam@redhat.com) + +* Wed Aug 09 2023 Brian C. Lane 39.4-1 - Exclude more obsoleted libertas firmware packages (awilliam@redhat.com) +- Revert "test_minimizer: dnf5 wants --use-host-config" (bcl@redhat.com) -* Mon Aug 07 2023 Brian C. Lane 38.11-1 +* Mon Aug 07 2023 Brian C. Lane 39.3-1 - runtime-install: excluded renamed olpc firmware package (awilliam@redhat.com) + +* Fri Jul 14 2023 Brian C. Lane 39.2-1 +- pylint: Ignore false positive from pylint on rawhide (bcl@redhat.com) +- tests: Fix image_minimizer test dnf usage (bcl@redhat.com) +- tests: Fix HFS test to work with new get_file_magic output (bcl@redhat.com) +- ltmpl: Use ProcMount while running the dnf transaction (bcl@redhat.com) +- imgutils: Split part DracutChroot into ProcMount (bcl@redhat.com) +- runtime-postinstall: Remove libuser.conf (bcl@redhat.com) - runtime-install: exclude renamed iwl firmware packages (awilliam@redhat.com) +- test_minimizer: dnf5 wants --use-host-config (bcl@redhat.com) +- Install nvme-cli tool and remove machine specific nvme files (bcl@redhat.com) +- Revert "Add blacklist_exceptions to multipath.conf" (jstodola@redhat.com) -* Mon Mar 27 2023 Brian C. Lane 38.10-1 +* Wed May 31 2023 Brian C. Lane 39.1-1 +- livemedia-creator: Reorganize the qemu arch patch (bcl@redhat.com) +- Make sure -machine is passed to qemu (hadess@hadess.net) +- Only allow UEFI support to be enabled on x86_64 (hadess@hadess.net) +- Throw an error when KVM is enabled on non-native installs (hadess@hadess.net) +- docs: Clarify that kickstarts need a part command (bcl@redhat.com) +- livemedia-creator: Raise an error when no partitions are in the ks (bcl@redhat.com) +- monitor: Skip repo errors involving CDROM/file source (bcl@redhat.com) +- logging: Remove duplicate stream logging (bcl@redhat.com) - Pass vga=791 for live basic graphics mode on BIOS (#2176782) (awilliam@redhat.com) +- livemedia-creator: Use -cpu host by default, add -cpu option to override (bcl@redhat.com) -* Tue Mar 14 2023 Brian C. Lane 38.9-1 +* Tue Mar 14 2023 Brian C. Lane 39.0-1 - Add setpriv as ostree containers dependency (#2125655) (jkonecny@redhat.com) - -* Mon Feb 20 2023 Brian C. Lane 38.8-1 -- New lorax documentation - 38.8 (bcl@redhat.com) +- livemedia-creator: Do not omit plymouth module from dracut (bcl@redhat.com) +- New lorax documentation - 39.0 (bcl@redhat.com) - workflow: Update list of push branches for workflow tests (bcl@redhat.com) -- Use Fedora 38 container for running podman tests (bcl@redhat.com) -- Update default releasever and platform id for Fedora 38 (bcl@redhat.com) +- Prepare for version 39.0 release (bcl@redhat.com) * Mon Feb 20 2023 Brian C. Lane 38.7-1 - Don't strip gtk4 binaries or libtiff (#2170716) (awilliam@redhat.com) diff --git a/plans/build-iso.fmf b/plans/build-iso.fmf index ae03eff..e3c3d28 100644 --- a/plans/build-iso.fmf +++ b/plans/build-iso.fmf @@ -1,7 +1,3 @@ summary: Run Lorax tests (build an iso, run mkksiso on it) -prepare: - how: install - package: - - lorax execute: script: ./tests/scripts/run_tests.sh diff --git a/sources b/sources index d02da4e..0b5f402 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-38.12.tar.gz) = 07efb664dc4dc56b417aad9aa1f69cf9b4eeef29e72628ffeb80977602cf630e4361b914a5203a24c6abb8cecec9572f479c6ed28b9d9f25b5c2d765af5cdf3b +SHA512 (lorax-44.4.tar.gz) = e2be9a13a0aec657bfe9a32dbd51e9024dfcb89471dbc57b8206dccdcd71cf5561fb25f97a7fdaca2b0279a2966b142ddf4e4544577ac2b47171f19648742577 diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index 70d37b4..f4849b2 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -177,22 +177,44 @@ function test_two_kickstarts { status "Test two kickstart error" } - function test_files { [ -e "$ISODIR/services" ] || fail "Missing file from iso" } +# Test adding an updates.img file +function add_updatesimg { + running "Add updates.img" + + # nothing in the file, just test that it is there + touch /tmp/updates.img + mkksiso -u /tmp/updates.img $BOOTISO $OUTISO || exit 1 + mount $OUTISO $ISODIR || exit 1 + + test_updatesimg + + status "Add updates.img" + umount_dirs +} + +function test_updatesimg { + [ -e "$ISODIR/updates.img" ] || fail "Missing updates.img file from iso" + grep "inst.updates=.*updates.img" "$ISODIR/boot/grub2/grub.cfg" || fail "Missing BIOS grub.cfg inst.updates entry" + grep "inst.updates=.*updates.img" "$ISODIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg inst.updates entry" +} + # All of the changes function run_all { running "Use all the options" - mkksiso -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO || exit 1 + touch /tmp/updates.img + mkksiso -u /tmp/updates.img -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks test_serial test_volid test_files + test_updatesimg test_quiet status "Use all the options" @@ -204,13 +226,15 @@ function run_as_user { running "Use all the options as a user" [ ! -e "/home/lorax-ted" ] && useradd -m lorax-ted - su - lorax-ted -c "mkksiso --skip-mkefiboot -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO" || exit 1 + touch /tmp/updates.img + su - lorax-ted -c "mkksiso --skip-mkefiboot -u /tmp/updates.img -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO" || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks test_serial test_volid test_files + test_updatesimg test_quiet status "Use all the options as a user with --skip-mkefiboot" @@ -230,7 +254,7 @@ fi # Run lorax using the host's repository configuration file if [ ! -e "$BOOTISO" ]; then running "Build boot.iso with lorax" - lorax --product="Fedora" --version=38 --release=38 --volid="Fedora-38-test" \ + lorax --product="Fedora" --version=rawhide --release=rawhide --volid="Fedora-rawhide-test" \ $REPOS --isfinal --nomacboot /var/tmp/lorax-fedora-iso/ || exit 1 fi @@ -243,6 +267,7 @@ new_volid add_files remove_quiet test_two_kickstarts +add_updatesimg run_all run_as_user