diff options
| author | Ray Strode <rstrode@redhat.com> | 2008-07-09 21:31:20 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2008-07-09 21:31:20 -0400 |
| commit | d8086a93a37e1e76c7b544a13faef13683c79b62 (patch) | |
| tree | c4e0856b634c8576988051ed4be69cb3cfe959b0 | |
| parent | d10b3eb6da0521dc1bb0a2a1d62f619a2460d73c (diff) | |
| download | plymouth-d8086a93a37e1e76c7b544a13faef13683c79b62.tar.gz plymouth-d8086a93a37e1e76c7b544a13faef13683c79b62.tar.xz plymouth-d8086a93a37e1e76c7b544a13faef13683c79b62.zip | |
Compute libdir using yet a different heuristic
The previous one falls over for ia64
| -rwxr-xr-x | scripts/plymouth-populate-initrd.in | 2 | ||||
| -rwxr-xr-x | scripts/plymouth-set-default-plugin | 2 | ||||
| -rwxr-xr-x | scripts/plymouth-update-initrd.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in index 033ca06..e4ccded 100755 --- a/scripts/plymouth-populate-initrd.in +++ b/scripts/plymouth-populate-initrd.in @@ -7,7 +7,7 @@ set -e [ -z "$LIBEXECDIR" ] && LIBEXECDIR="/usr/libexec" [ -z "$DATADIR" ] && DATADIR="/usr/share" [ -z "$SYSTEMMAP" ] && SYSTEM_MAP="/boot/System.map-$(/bin/uname -r)" -[ -z "$LIB" ] && $(eu-readelf -h /usr/bin/plymouth | grep Class | grep -q ELF64) && LIB="lib64" || LIB="lib" +[ -z "$LIB" ] && $(echo nash-showelfinterp /usr/bin/plymouth | /sbin/nash --forcequiet | grep -q lib64) && LIB="lib64" || LIB="lib" [ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB" [ -z "$BINDIR" ] && BINDIR="/usr/bin" [ -z "$GRUB_MENU_TITLE" ] && GRUB_MENU_TITLE="Graphical Bootup" diff --git a/scripts/plymouth-set-default-plugin b/scripts/plymouth-set-default-plugin index a2ac8fd..3edee7a 100755 --- a/scripts/plymouth-set-default-plugin +++ b/scripts/plymouth-set-default-plugin @@ -4,7 +4,7 @@ set -e [ -z "$LIBEXECDIR" ] && LIBEXECDIR="/usr/libexec" [ -z "$DATADIR" ] && DATADIR="/usr/share" -[ -z "$LIB" ] && $(eu-readelf -h /usr/bin/plymouth | grep Class | grep -q ELF64) && LIB="lib64" || LIB="lib" +[ -z "$LIB" ] && $(echo nash-showelfinterp /usr/bin/plymouth | /sbin/nash --forcequiet | grep -q lib64) && LIB="lib64" || LIB="lib" [ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB" [ -z "$BINDIR" ] && BINDIR="/usr/bin" diff --git a/scripts/plymouth-update-initrd.in b/scripts/plymouth-update-initrd.in index 2d37bcf..b8bc8f8 100755 --- a/scripts/plymouth-update-initrd.in +++ b/scripts/plymouth-update-initrd.in @@ -8,7 +8,7 @@ set -e [ -z "$DATADIR" ] && DATADIR="/usr/share" [ -z "$INITRD" ] && INITRD="/boot/initrd-$(/sbin/grubby --default-kernel | sed 's/.*vmlinuz-//g').img" [ -z "$SYSTEMMAP" ] && SYSTEM_MAP="/boot/System.map-$(/bin/uname -r)" -[ -z "$LIB" ] && $(eu-readelf -h /usr/bin/plymouth | grep Class | grep -q ELF64) && LIB="lib64" || LIB="lib" +[ -z "$LIB" ] && $(echo nash-showelfinterp /usr/bin/plymouth | /sbin/nash --forcequiet | grep -q lib64) && LIB="lib64" || LIB="lib" [ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB" [ -z "$BINDIR" ] && BINDIR="/usr/bin" [ -z "$GRUB_MENU_TITLE" ] && GRUB_MENU_TITLE="Graphical Bootup" |