From 368282d9ec958e42227af82f85d65c5575485c7e Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 13 Oct 2013 13:03:11 +0200 Subject: [PATCH] initrd.defaults, gen_initramfs: /bin/plymouth moved to /usr/bin And this is just ridiculous! --- defaults/initrd.defaults | 1 + gen_initramfs.sh | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults index 47c7f31..2cc05a0 100755 --- a/defaults/initrd.defaults +++ b/defaults/initrd.defaults @@ -66,6 +66,7 @@ PLYMOUTHD_BIN='/sbin/plymouthd' [ ! -e "${PLYMOUTHD_BIN}" ] && PLYMOUTHD_BIN='/usr/sbin/plymouthd' PLYMOUTH_BIN='/bin/plymouth' +[ ! -e "${PLYMOUTH_BIN}" ] && PLYMOUTH_BIN='/usr/bin/plymouth' REAL_ROOT='' CONSOLE='/dev/console' NEW_ROOT='/newroot' diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 75872fc..1d2c804 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -482,8 +482,12 @@ append_plymouth() { [ ! -e "${plymouthd_bin}" ] && \ plymouthd_bin="/usr/sbin/plymouthd" + local plymouth_bin="/bin/plymouth" + [ ! -e "${plymouth_bin}" ] && \ + plymouth_bin="/usr/bin/plymouth" + copy_binaries "${TEMP}/initramfs-ply-temp" \ - "${plymouthd_bin}" /bin/plymouth \ + "${plymouthd_bin}" "${plymouth_bin}" \ "${final_libs[@]}" || gen_die "cannot copy plymouth" log_future_cpio_content