From: Peter Jones <pjones@redhat.com>
Date: Fri, 10 Sep 2010 15:30:28 +0000 (-0400)
Subject: Be sure and get the right architecture for rsylogd modules.
X-Git-Tag: 008~131
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9346982f22d3fa94d2a31ba6499835ab8be74859;p=thirdparty%2Fdracut.git

Be sure and get the right architecture for rsylogd modules.

I've tested this locally on 64-bit with:

dracut -a syslog -f -v foo.img `uname -r`

And I see this in the output:

I: *** Sourcing module syslog
I: Installing /sbin/rsyslogd
I: Installing /lib64/rsyslog/lmnet.so
I: Installing /lib64/rsyslog/imklog.so
I: Installing /lib64/rsyslog/imuxsock.so
I: Installing /usr/share/dracut/modules.d/98syslog/parse-syslog-opts.sh
I: Installing /usr/share/dracut/modules.d/98syslog/syslog-genrules.sh
I: Installing /usr/share/dracut/modules.d/98syslog/syslog-cleanup.sh
I: Installing /usr/share/dracut/modules.d/98syslog/rsyslogd-start.sh
I: Installing /usr/share/dracut/modules.d/98syslog/rsyslogd-stop.sh
I: Installing /usr/share/dracut/modules.d/98syslog/rsyslog.conf
---

diff --git a/modules.d/98syslog/install b/modules.d/98syslog/install
index ed5958e3a..cca088d82 100755
--- a/modules.d/98syslog/install
+++ b/modules.d/98syslog/install
@@ -3,7 +3,12 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 if type -P rsyslogd >/dev/null; then
-    installs="rsyslogd /lib/rsyslog/lmnet.so /lib/rsyslog/imklog.so /lib/rsyslog/imuxsock.so"
+    installs="rsyslogd"
+    for i in {"$libdir","$usrlibdir"}/rsyslog/lmnet.so \
+            {"$libdir","$usrlibdir"}/rsyslog/imklog.so \
+            {"$libdir","$usrlibdir"}/rsyslog/imuxsock.so ; do
+        [ -e "$i" ] && installs="$installs $i"
+    done
 elif type -P syslogd >/dev/null; then
     installs="syslogd"
 elif type -P syslog-ng >/dev/null; then