Blame 0018-dracut-logger.sh-check-is-journald.socket-is-active.patch
|
Harald Hoyer |
fe48c9 |
From 6a877a79c4c94d4e6752c981559ac85f21073973 Mon Sep 17 00:00:00 2001
|
|
Harald Hoyer |
fe48c9 |
From: Harald Hoyer <harald@redhat.com>
|
|
Harald Hoyer |
fe48c9 |
Date: Wed, 28 Aug 2013 20:01:54 +0200
|
|
Harald Hoyer |
fe48c9 |
Subject: [PATCH] dracut-logger.sh: check is journald.socket is active
|
|
Harald Hoyer |
fe48c9 |
|
|
Harald Hoyer |
fe48c9 |
before using systemd-cat, make sure someone is listening
|
|
Harald Hoyer |
fe48c9 |
---
|
|
Harald Hoyer |
fe48c9 |
dracut-logger.sh | 5 ++++-
|
|
Harald Hoyer |
fe48c9 |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
Harald Hoyer |
fe48c9 |
|
|
Harald Hoyer |
fe48c9 |
diff --git a/dracut-logger.sh b/dracut-logger.sh
|
|
Harald Hoyer |
fe48c9 |
index 0c505e2..b052581 100755
|
|
Harald Hoyer |
fe48c9 |
--- a/dracut-logger.sh
|
|
Harald Hoyer |
fe48c9 |
+++ b/dracut-logger.sh
|
|
Harald Hoyer |
fe48c9 |
@@ -141,7 +141,10 @@ dlog_init() {
|
|
Harald Hoyer |
fe48c9 |
fi
|
|
Harald Hoyer |
fe48c9 |
|
|
Harald Hoyer |
fe48c9 |
if (( $sysloglvl > 0 )); then
|
|
Harald Hoyer |
fe48c9 |
- if [[ -d /run/systemd/journal ]] && type -P systemd-cat &>/dev/null && (( $UID == 0 )) ; then
|
|
Harald Hoyer |
fe48c9 |
+ if [[ -d /run/systemd/journal ]] \
|
|
Harald Hoyer |
fe48c9 |
+ && type -P systemd-cat &>/dev/null \
|
|
Harald Hoyer |
fe48c9 |
+ && (( $UID == 0 )) \
|
|
Harald Hoyer |
fe48c9 |
+ && systemctl is-active systemd-journald.socket &>/dev/null; then
|
|
Harald Hoyer |
fe48c9 |
readonly _dlogdir="$(mktemp --tmpdir="$TMPDIR/" -d -t dracut-log.XXXXXX)"
|
|
Harald Hoyer |
fe48c9 |
readonly _systemdcatfile="$_dlogdir/systemd-cat"
|
|
Harald Hoyer |
fe48c9 |
mkfifo "$_systemdcatfile"
|