From: Franck Bui <fbui@suse.com>
Date: Fri, 6 Aug 2021 14:47:32 +0000 (+0200)
Subject: test: if haveged is part of initrd it needs to be installed in the image too
X-Git-Tag: v250-rc1~803^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F20436%2Fhead;p=thirdparty%2Fsystemd.git

test: if haveged is part of initrd it needs to be installed in the image too

Otherwise haveged won't survive when switching root from initrd to host making
haveged service in host fail.
---

diff --git a/test/test-functions b/test/test-functions
index 8b8c89a2062..fc545302715 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -664,6 +664,7 @@ setup_basic_environment() {
     install_fs_tools
     install_modules
     install_plymouth
+    install_haveged
     install_debug_tools
     install_ld_so_conf
     install_testuser
@@ -1426,6 +1427,16 @@ install_plymouth() {
     # fi
 }
 
+install_haveged() {
+    # If haveged is installed and probably included in initrd, it needs to be
+    # installed in the image too.
+    if [ -x /usr/sbin/haveged ]; then
+        dinfo "Install haveged files"
+        inst /usr/sbin/haveged
+        inst /usr/lib/systemd/system/haveged.service
+    fi
+}
+
 install_ld_so_conf() {
     dinfo "Install /etc/ld.so.conf*"
     cp -a /etc/ld.so.conf* "${initdir:?}/etc"