From: Eric Edgar <rocket@gentoo.org>
Date: Wed, 23 Nov 2005 00:54:49 +0000 (+0000)
Subject: Fix bug 113287
X-Git-Tag: v3.4.10.902~424
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=87ca0a54ba6d5f5ed15a483e2dee01c85fce45b5;p=genkernel.git

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 348a730..e7e8c56 100644
--- 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 d3b94fe..614f299 100644
--- 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