From fc4bbd33fe0c2800b3e06f9eebdef76cec3dc12e Mon Sep 17 00:00:00 2001 From: Bin Xu Date: Wed, 11 Apr 2018 14:19:35 +0800 Subject: [PATCH] Fix the issue for stateless node in debug mode, /dev/log is not available (#5086) (#4929) - use imjournal to make rsyslogd work well with journald --- .../netboot/rh/dracut_033/patch/syslog/module-setup.sh | 2 +- .../netboot/rh/dracut_033/patch/syslog/rsyslogd-start.sh | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xCAT-server/share/xcat/netboot/rh/dracut_033/patch/syslog/module-setup.sh b/xCAT-server/share/xcat/netboot/rh/dracut_033/patch/syslog/module-setup.sh index 386a3a40b..ba8ed94cf 100755 --- a/xCAT-server/share/xcat/netboot/rh/dracut_033/patch/syslog/module-setup.sh +++ b/xCAT-server/share/xcat/netboot/rh/dracut_033/patch/syslog/module-setup.sh @@ -16,7 +16,7 @@ install() { local _installs if type -P rsyslogd >/dev/null; then _installs="rsyslogd" - inst_libdir_file rsyslog/lmnet.so rsyslog/imklog.so rsyslog/imuxsock.so + inst_libdir_file rsyslog/lmnet.so rsyslog/imklog.so rsyslog/imuxsock.so rsyslog/imjournal.so elif type -P syslogd >/dev/null; then _installs="syslogd" elif type -P syslog-ng >/dev/null; then diff --git a/xCAT-server/share/xcat/netboot/rh/dracut_033/patch/syslog/rsyslogd-start.sh b/xCAT-server/share/xcat/netboot/rh/dracut_033/patch/syslog/rsyslogd-start.sh index 9589af436..b0a3e6a94 100755 --- a/xCAT-server/share/xcat/netboot/rh/dracut_033/patch/syslog/rsyslogd-start.sh +++ b/xCAT-server/share/xcat/netboot/rh/dracut_033/patch/syslog/rsyslogd-start.sh @@ -21,7 +21,12 @@ rsyslog_config() { # echo "${filter} @${server}" # done - + # In dracut 33, default rsyslogd configuration does not use journald. Then when + # rsyslog in debug mode, it causes `/dev/log` is not available after switch_root (#4929) + echo "\$ModLoad imjournal" + echo "\$OmitLocalLogging on" + echo "\$IMJournalStateFile imjournal.state" + if [ -n "$filters" ];then confline="${filters}"; else