From 8f4c8540591dd1de4d60fcaa33a1fc7713f31463 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Mon, 14 Oct 2013 16:53:27 +0200 Subject: [PATCH] gen_initramfs: libply-splash-core.so.* moved to /usr/lib This is still part of the ridiculous, pointless and unsafe plymouth move to /usr --- gen_initramfs.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 1d2c804..a230255 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -426,6 +426,7 @@ append_plymouth() { mkdir -p "${TEMP}/initramfs-ply-temp/usr/share/plymouth/themes" mkdir -p "${TEMP}/initramfs-ply-temp/etc/plymouth" mkdir -p "${TEMP}/initramfs-ply-temp/"{bin,sbin} + mkdir -p "${TEMP}/initramfs-ply-temp/usr/"{bin,sbin} cd "${TEMP}/initramfs-ply-temp" @@ -460,8 +461,15 @@ append_plymouth() { "${TEMP}/initramfs-ply-temp${theme_dir}/default.plymouth" || \ gen_die "cannot setup the default plymouth theme" + # plymouth may have placed the libs into /usr/ + local libply_core="/lib*/libply-splash-core.so.*" + if ! ls -1 ${libply_core} 2>/dev/null >/dev/null; then + libply_core="/usr/lib*/libply-splash-core.so.*" + fi + local libs=( - "/lib*/libply-splash-core.so.*" + "${libply_core}" + "/usr/lib*/libply-splash-core.so.*" "/usr/lib*/libply-splash-graphics.so.*" "/usr/lib*/plymouth/text.so" "/usr/lib*/plymouth/details.so"