diff options
author | Ray Strode <rstrode@redhat.com> | 2008-11-12 16:26:16 -0500 |
---|---|---|
committer | Ray Strode <rstrode@redhat.com> | 2008-11-12 16:26:16 -0500 |
commit | b038572c634a132bcb3c764fadc01025aa30fce5 (patch) | |
tree | 1262e27aac4fd91a9b2780ad21fd00b2ffb7bed4 /scripts/plymouth-populate-initrd.in | |
parent | 150b41b08721334f50c0b953ae8e860b33951245 (diff) |
Don't reset LIB="lib" when LIB is in environment
It was causing scriptlet failures.
Diffstat (limited to 'scripts/plymouth-populate-initrd.in')
-rwxr-xr-x | scripts/plymouth-populate-initrd.in | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in index cc640e5f..d2f1e6d1 100755 --- a/scripts/plymouth-populate-initrd.in +++ b/scripts/plymouth-populate-initrd.in @@ -5,7 +5,13 @@ [ -z "$LIBEXECDIR" ] && LIBEXECDIR="/usr/libexec" [ -z "$DATADIR" ] && DATADIR="/usr/share" [ -z "$SYSTEMMAP" ] && SYSTEM_MAP="/boot/System.map-$(/bin/uname -r)" -[ -z "$LIB" ] && $(echo nash-showelfinterp @plymouthclientdir@/plymouth | /sbin/nash --forcequiet | grep -q lib64) && LIB="lib64" || LIB="lib" +if [ -z "$LIB" ]; then + if $(echo nash-showelfinterp /proc/$$/exe | /sbin/nash --forcequiet | grep -q lib64); then + LIB="lib64" + else + LIB="lib" + fi +fi [ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB" [ -z "$BINDIR" ] && BINDIR="/usr/bin" [ -z "$GRUB_MENU_TITLE" ] && GRUB_MENU_TITLE="Graphical Bootup" |