From 26136aa21011ea07c44c1855ce304b404d3aad70 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 13 Dec 2022 10:26:01 -0800 Subject: [PATCH] - Run user test with --skip-mkefiboot --- lorax.spec | 5 ++++- tests/scripts/run_tests.sh | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lorax.spec b/lorax.spec index 81f509f..a4c3e3c 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 38.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -168,6 +168,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Dec 13 2022 Brian C. Lane - 38.4-2 +- Run user test with --skip-mkefiboot + * Mon Dec 12 2022 Brian C. Lane 38.4-1 - runtime-cleanup: drop old versions of qed firmware (awilliam@redhat.com) - runtime-cleanup: drop Mediatek SoC firmwares (awilliam@redhat.com) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index d544946..3559b7d 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -199,12 +199,12 @@ function run_all { umount_dirs } -# All of the changes as a user (lorax-ted) +# All of the changes as a user (lorax-ted) with --skip-mkefiboot 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 -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO" || exit 1 + 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 mount $OUTISO $ISODIR || exit 1 test_ks @@ -213,7 +213,7 @@ function run_as_user { test_files test_quiet - status "Use all the options as a user" + status "Use all the options as a user with --skip-mkefiboot" umount_dirs }