From e84cc7804cf7c0388e41cc7310cda07dbb7f56b1 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Tue, 11 Nov 2008 17:13:07 +0200 Subject: [PATCH] mkinitramfs: Enhanced linux26 integration to use the original initrd.img instead of the one at /boot when possible --- base/mkinitramfs/pkg_linux26_post.conf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/base/mkinitramfs/pkg_linux26_post.conf b/base/mkinitramfs/pkg_linux26_post.conf index 88780c704..64798b9ae 100644 --- a/base/mkinitramfs/pkg_linux26_post.conf +++ b/base/mkinitramfs/pkg_linux26_post.conf @@ -12,13 +12,13 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -hook_add postdoc 5 'mkinitrd_run' +. package/*/mkinitramfs/find_template.in + +hook_add postdoc 5 "mkinitrd_run $initrd_img" mkinitrd_run() { - if pkginstalled mkinitramfs; then - echo_status "running mkinitramfs ..." - sh "$root$( pkgprefix sbindir mkinitramfs )/mkinitramfs" -R "${root:-/}" "${lx_kernelrelease}" - else - echo_warning "mkinitramfs is missing." - fi + local template="$1" + sh "$root$( pkgprefix sbindir mkinitramfs )/mkinitramfs" -R "${root:-/}" \ + ${template:+-T $template} "${lx_kernelrelease}" } +