Blame 0012-test-TEST-04-FULL-SYSTEMD-optionally-install-machine.patch
|
Harald Hoyer |
7ba020 |
From b8bccd398a4214376474c330ee4b756a4d0c1d19 Mon Sep 17 00:00:00 2001
|
|
Harald Hoyer |
7ba020 |
From: Harald Hoyer <harald@redhat.com>
|
|
Harald Hoyer |
7ba020 |
Date: Mon, 14 Dec 2015 15:12:24 +0100
|
|
Harald Hoyer |
7ba020 |
Subject: [PATCH] test/TEST-04-FULL-SYSTEMD: optionally install machine-info
|
|
Harald Hoyer |
7ba020 |
and *-id
|
|
Harald Hoyer |
7ba020 |
|
|
Harald Hoyer |
7ba020 |
---
|
|
Harald Hoyer |
7ba020 |
test/TEST-04-FULL-SYSTEMD/test.sh | 6 +++++-
|
|
Harald Hoyer |
7ba020 |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
Harald Hoyer |
7ba020 |
|
|
Harald Hoyer |
7ba020 |
diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
|
|
Harald Hoyer |
7ba020 |
index 6ea9281..f5a9d48 100755
|
|
Harald Hoyer |
7ba020 |
--- a/test/TEST-04-FULL-SYSTEMD/test.sh
|
|
Harald Hoyer |
7ba020 |
+++ b/test/TEST-04-FULL-SYSTEMD/test.sh
|
|
Harald Hoyer |
7ba020 |
@@ -264,9 +264,13 @@ EOF
|
|
Harald Hoyer |
7ba020 |
inst_hook emergency 000 ./hard-off.sh
|
|
Harald Hoyer |
7ba020 |
inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
|
|
Harald Hoyer |
7ba020 |
)
|
|
Harald Hoyer |
7ba020 |
+
|
|
Harald Hoyer |
7ba020 |
+ [ -e /etc/machine-id ] && EXTRA_MACHINE="/etc/machine-id"
|
|
Harald Hoyer |
7ba020 |
+ [ -e /etc/machine-info ] && EXTRA_MACHINE+=" /etc/machine-info"
|
|
Harald Hoyer |
7ba020 |
+
|
|
Harald Hoyer |
7ba020 |
sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
|
|
Harald Hoyer |
7ba020 |
-a "debug systemd i18n" \
|
|
Harald Hoyer |
7ba020 |
- -I "/etc/machine-id /etc/hostname" \
|
|
Harald Hoyer |
7ba020 |
+ ${EXTRA_MACHINE:+-I "$EXTRA_MACHINE"} \
|
|
Harald Hoyer |
7ba020 |
-o "dash network plymouth lvm mdraid resume crypt caps dm terminfo usrmount kernel-network-modules" \
|
|
Harald Hoyer |
7ba020 |
-d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esb ib700wdt" \
|
|
Harald Hoyer |
7ba020 |
--no-hostonly-cmdline -N \
|