tests: Update the updates.img test for changes in lorax-40.5.8
The updates.img is now places in the / of the iso and inst.updates is now used on the cmdline. Related: RHEL-61778
This commit is contained in:
parent
2e5a18d6c9
commit
b98346c5b6
@ -245,8 +245,8 @@ function add_updatesimg {
|
|||||||
running "Add updates.img"
|
running "Add updates.img"
|
||||||
|
|
||||||
# nothing in the file, just test that it is there
|
# nothing in the file, just test that it is there
|
||||||
touch /tmp/test-updates.img
|
touch /tmp/updates.img
|
||||||
mkksiso -u /tmp/test-updates.img $BOOTISO $OUTISO || exit 1
|
mkksiso -u /tmp/updates.img $BOOTISO $OUTISO || exit 1
|
||||||
mount $OUTISO $ISODIR || exit 1
|
mount $OUTISO $ISODIR || exit 1
|
||||||
|
|
||||||
test_updatesimg
|
test_updatesimg
|
||||||
@ -256,15 +256,18 @@ function add_updatesimg {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function test_updatesimg {
|
function test_updatesimg {
|
||||||
[ -e "$ISODIR/updates/updates.img" ] || fail "Missing file from iso"
|
[ -e "$ISODIR/updates.img" ] || fail "Missing 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
|
# All of the changes
|
||||||
function run_all {
|
function run_all {
|
||||||
running "Use all the options"
|
running "Use all the options"
|
||||||
|
|
||||||
touch /tmp/test-updates.img
|
touch /tmp/updates.img
|
||||||
mkksiso -u /tmp/test-updates.img -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO || exit 1
|
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
|
mount $OUTISO $ISODIR || exit 1
|
||||||
|
|
||||||
test_ks
|
test_ks
|
||||||
@ -283,8 +286,8 @@ function run_as_user {
|
|||||||
running "Use all the options as a user"
|
running "Use all the options as a user"
|
||||||
|
|
||||||
[ ! -e "/home/lorax-ted" ] && useradd -m lorax-ted
|
[ ! -e "/home/lorax-ted" ] && useradd -m lorax-ted
|
||||||
touch /tmp/test-updates.img
|
touch /tmp/updates.img
|
||||||
su - lorax-ted -c "mkksiso --skip-mkefiboot -u /tmp/test-updates.img -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 -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
|
mount $OUTISO $ISODIR || exit 1
|
||||||
|
|
||||||
test_ks
|
test_ks
|
||||||
|
Loading…
Reference in New Issue
Block a user