test/TEST-04-FULL-SYSTEMD: optionally install machine-info and *-id

diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
index 6ea9281650763d59490179114c9db46e1ac5e0c1..f5a9d48c31c9af8beb20fc6f35bda1c0d11985a2 100755 (executable)
--- a/test/TEST-04-FULL-SYSTEMD/test.sh
+++ b/test/TEST-04-FULL-SYSTEMD/test.sh
@@ -264,9 +264,13 @@ EOF
        inst_hook emergency 000 ./hard-off.sh
        inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
     )
+
+    [ -e /etc/machine-id ] && EXTRA_MACHINE="/etc/machine-id"
+    [ -e /etc/machine-info ] && EXTRA_MACHINE+=" /etc/machine-info"
+
     sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
        -a "debug systemd i18n" \
-       -I "/etc/machine-id /etc/hostname" \
+       ${EXTRA_MACHINE:+-I "$EXTRA_MACHINE"} \
         -o "dash network plymouth lvm mdraid resume crypt caps dm terminfo usrmount kernel-network-modules" \
        -d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esb ib700wdt" \
         --no-hostonly-cmdline -N \