diff options
| author | Ray Strode <rstrode@redhat.com> | 2008-06-11 16:46:04 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2008-06-11 17:19:55 -0400 |
| commit | 1e457ae39c31c68db3b2ff81796fc74c5b3cba86 (patch) | |
| tree | f763d3738f80d9be1bd511cbbdadd43d75a1ce60 /scripts | |
| parent | 5a85be71eac3b2250c0399b1101ae046963cd7de (diff) | |
| download | plymouth-1e457ae39c31c68db3b2ff81796fc74c5b3cba86.tar.gz plymouth-1e457ae39c31c68db3b2ff81796fc74c5b3cba86.tar.xz plymouth-1e457ae39c31c68db3b2ff81796fc74c5b3cba86.zip | |
Update populate and update initrd scripts to use the same lib heuristic as set-default-plugin
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/plymouth-populate-initrd | 2 | ||||
| -rwxr-xr-x | scripts/plymouth-update-initrd | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/plymouth-populate-initrd b/scripts/plymouth-populate-initrd index f77063d..087d9f8 100755 --- a/scripts/plymouth-populate-initrd +++ b/scripts/plymouth-populate-initrd @@ -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" ] && [ $(head -n1 $SYSTEM_MAP | awk '{print $1}' | wc -c) -lt 16 ] && LIB="lib" || LIB="lib64" +[ -z "$LIB" ] && $(eu-readelf -h /usr/bin/plymouth | grep Class | grep -q ELF64) && 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-update-initrd b/scripts/plymouth-update-initrd index 6bf8ba9..a71099f 100755 --- a/scripts/plymouth-update-initrd +++ b/scripts/plymouth-update-initrd @@ -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" ] && [ $(head -n1 $SYSTEM_MAP | awk '{print $1}' | wc -c) -lt 16 ] && LIB="lib" || LIB="lib64" +[ -z "$LIB" ] && $(eu-readelf -h /usr/bin/plymouth | grep Class | grep -q ELF64) && LIB="lib64" || LIB="lib" [ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB" [ -z "$BINDIR" ] && BINDIR="/usr/bin" [ -z "$GRUB_MENU_TITLE" ] && GRUB_MENU_TITLE="Graphical Bootup" |