From: Warren Togami <wtogami-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
To: initramfs <initramfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Subject: [PATCH] Check /sbin/plymouthd for arch instead of /proc/$$/exe.
Date: Wed, 20 May 2009 20:37:55 -0400 [thread overview]
Message-ID: <4A14A263.6000902@redhat.com> (raw)
In-Reply-To: <4A147DF3.4070108-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Here is an improved version of this patch. /sbin/plymouthd is guaranteed to exist if it passed the check, and it would be of the correct architecture.
From 6d1b465555ac4511b9bda90b7d72c29060c66955 Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Date: Wed, 20 May 2009 20:35:08 -0400
Subject: [PATCH] Check /sbin/plymouthd for arch instead of /proc/$$/exe.
/sbin/plymouthd is guaranteed to be there and be the correct arch.
---
.../50plymouth-pre0.7/plymouth-populate-initrd | 2 +-
modules.d/50plymouth/plymouth-populate-initrd | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules.d/50plymouth-pre0.7/plymouth-populate-initrd b/modules.d/50plymouth-pre0.7/plymouth-populate-initrd
index e195ddc..1802b25 100755
--- a/modules.d/50plymouth-pre0.7/plymouth-populate-initrd
+++ b/modules.d/50plymouth-pre0.7/plymouth-populate-initrd
@@ -1,5 +1,5 @@
#!/bin/bash
-if ldd /proc/$$/exe |grep -q lib64; then
+if ldd /sbin/plymouthd |grep -q lib64; then
LIBDIR="/usr/lib64"
else
LIBDIR="/usr/lib"
diff --git a/modules.d/50plymouth/plymouth-populate-initrd b/modules.d/50plymouth/plymouth-populate-initrd
index df6e7c5..f3c67f1 100755
--- a/modules.d/50plymouth/plymouth-populate-initrd
+++ b/modules.d/50plymouth/plymouth-populate-initrd
@@ -1,5 +1,5 @@
#!/bin/bash
-if ldd /proc/$$/exe |grep -q lib64; then
+if ldd /sbin/plymouthd |grep -q lib64; then
LIBDIR="/usr/lib64"
else
LIBDIR="/usr/lib"
--
1.6.2.2
--
To unsubscribe from this list: send the line "unsubscribe initramfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
prev parent reply other threads:[~2009-05-21 0:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-20 20:22 [PATCH] LIBDIR detection without /proc Warren Togami
[not found] ` <4A146687.3020508-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2009-05-20 20:52 ` Andreas Thienemann
[not found] ` <Pine.LNX.4.58.0905202249560.7805-bvJ793YqIODNUDpmljszgg@public.gmane.org>
2009-05-20 20:57 ` Warren Togami
[not found] ` <4A146EBF.5060404-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2009-05-20 21:24 ` Andreas Thienemann
[not found] ` <Pine.LNX.4.58.0905202309060.7805-bvJ793YqIODNUDpmljszgg@public.gmane.org>
2009-05-20 22:02 ` Warren Togami
[not found] ` <4A147DF3.4070108-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2009-05-21 0:37 ` Warren Togami [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A14A263.6000902@redhat.com \
--to=wtogami-h+wxahxf7alqt0dzr+alfa@public.gmane.org \
--cc=initramfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox