Fix bug 113287

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@328 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 348a73056cb4b41b09b148a729ee83a282c4091a..e7e8c56547facd37dd26bb0b86559550fc6aa0ac 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -515,7 +515,7 @@ merge_initramfs_cpio_archives(){
        # Pegasos hack for merging the initramfs into the kernel at compile time
        [ "${KERNEL_MAKE_DIRECTIVE}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] ||
                [ "${KERNEL_MAKE_DIRECTIVE_2}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] &&
-                       cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/arch/${ARCH}/boot/images/ramdisk.image.gz
+                       cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/arch/${ARCH}/boot/images/ramdisk.image.gz &&
                        rm ${TMPDIR}/initramfs-${KV}
 
        # Mips also mimics Pegasos to merge the initramfs into the kernel

diff --git a/gen_initrd.sh b/gen_initrd.sh
index d3b94feb162b0361e878f104441403c5dcafcf0c..614f299c6795ac9141405a85b35942f1a58c6982 100644 (file)
--- a/gen_initrd.sh
+++ b/gen_initrd.sh
@@ -397,7 +397,7 @@ create_initrd() {
        # Pegasos hack for merging the initrd into the kernel at compile time
        [ "${KERNEL_MAKE_DIRECTIVE}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] ||
                [ "${KERNEL_MAKE_DIRECTIVE_2}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] &&
-               cp ${TMPDIR}/initrd-${KV} ${KERNEL_DIR}/arch/${ARCH}/boot/images/ramdisk.image.gz
+               cp ${TMPDIR}/initrd-${KV} ${KERNEL_DIR}/arch/${ARCH}/boot/images/ramdisk.image.gz &&
                rm ${TMPDIR}/initrd-${KV}
 
        # Mips also mimics Pegasos to merge the initrd into the kernel