mirror of
https://github.com/systemd/systemd
synced 2024-09-06 00:41:36 +00:00
test: generate a custom initrd for TEST-24 if $INITRD is unset
Co-Authored-By: Yu Watanabe <watanabe.yu+github@gmail.com>
This commit is contained in:
parent
1fb7f8e15e
commit
b22d90e594
|
@ -66,6 +66,30 @@ EOF
|
|||
# Forward journal messages to the console, so we have something
|
||||
# to investigate even if we fail to mount the encrypted /var
|
||||
echo ForwardToConsole=yes >> "$initdir/etc/systemd/journald.conf"
|
||||
|
||||
# If $INITRD wasn't provided explicitly, generate a custom one with dm-crypt
|
||||
# support
|
||||
if [[ -z "$INITRD" ]]; then
|
||||
INITRD="${TESTDIR:?}/initrd.img"
|
||||
dinfo "Generating a custom initrd with dm-crypt support in '${INITRD:?}'"
|
||||
|
||||
if command -v dracut >/dev/null; then
|
||||
dracut --force --verbose --add crypt "$INITRD"
|
||||
elif command -v mkinitcpio >/dev/null; then
|
||||
mkinitcpio --addhooks sd-encrypt --generate "$INITRD"
|
||||
elif command -v mkinitramfs >/dev/null; then
|
||||
# The cryptroot hook is provided by the cryptsetup-initramfs package
|
||||
if ! dpkg-query -s cryptsetup-initramfs; then
|
||||
derror "Missing 'cryptsetup-initramfs' package for dm-crypt support in initrd"
|
||||
return 1
|
||||
fi
|
||||
|
||||
mkinitramfs -o "$INITRD"
|
||||
else
|
||||
dfatal "Unrecognized initrd generator, can't continue"
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
cleanup_root_var() {
|
||||
|
|
|
@ -337,6 +337,11 @@ qemu_min_version() {
|
|||
# Return 0 if qemu did run (then you must check the result state/logs for actual
|
||||
# success), or 1 if qemu is not available.
|
||||
run_qemu() {
|
||||
# If the test provided its own initrd, use it (e.g. TEST-24)
|
||||
if [[ -z "$INITRD" && -f "${TESTDIR:?}/initrd.img" ]]; then
|
||||
INITRD="$TESTDIR/initrd.img"
|
||||
fi
|
||||
|
||||
if [ -f /etc/machine-id ]; then
|
||||
read -r MACHINE_ID </etc/machine-id
|
||||
[ -z "$INITRD" ] && [ -e "$EFI_MOUNT/$MACHINE_ID/$KERNEL_VER/initrd" ] \
|
||||
|
|
Loading…
Reference in a new issue