On 08/05/19 at 02:40pm, Kairui Song wrote:
fadump will alter the normal boot initramfs and we don't want a
normal
boot to foward and drop the journalctl logs.
Signed-off-by: Kairui Song <kasong(a)redhat.com>
---
dracut-module-setup.sh | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index 9ef60210..3fa696da 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -839,9 +839,12 @@ install() {
fi
# Forward logs to console directly, this avoids unneccessary memory
- # consumption and make console output more useful
- mkdir -p ${initdir}/etc/systemd/journald.conf.d
- echo "[Journal]" > ${initdir}/etc/systemd/journald.conf.d/kdump.conf
- echo "Storage=none" >>
${initdir}/etc/systemd/journald.conf.d/kdump.conf
- echo "ForwardToConsole=yes" >>
${initdir}/etc/systemd/journald.conf.d/kdump.conf
+ # consumption and make console output more useful.
+ # Only do so for non fadump image.
+ if ! is_fadump_capable; then
+ mkdir -p ${initdir}/etc/systemd/journald.conf.d
+ echo "[Journal]" >
${initdir}/etc/systemd/journald.conf.d/kdump.conf
+ echo "Storage=none" >>
${initdir}/etc/systemd/journald.conf.d/kdump.conf
+ echo "ForwardToConsole=yes" >>
${initdir}/etc/systemd/journald.conf.d/kdump.conf
+ fi
}
--
2.21.0
_______________________________________________
kexec mailing list -- kexec(a)lists.fedoraproject.org
To unsubscribe send an email to kexec-leave(a)lists.fedoraproject.org
Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines:
https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedoraproject.org/archives/list/kexec@lists.fedoraproject.org
Looks good, thanks for the fix!
Acked-by: Dave Young <dyoung(a)redhat.com>
Thanks
Dave