From: Eric Edgar <rocket@gentoo.org>
Date: Mon, 18 Jul 2005 21:08:47 +0000 (+0000)
Subject: cause genkernel to die if cant write to the DEBUGFILE.  remove extra info strings... 
X-Git-Tag: v3.4.10.902~480
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cd242f5c3d3c4b5b3a7457c3d1a939f8e61dad24;p=genkernel.git

cause genkernel to die if cant write to the DEBUGFILE.  remove extra info strings that arent necessary


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

diff --git a/gen_funcs.sh b/gen_funcs.sh
index dcc48bf..fd6763f 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -191,7 +191,10 @@ cache_replace() {
 }
 
 clear_log() {
-	[ -f "${DEBUGFILE}" ] && echo > "${DEBUGFILE}"
+    if [ -f "${DEBUGFILE}" ]
+    then
+	(echo > "${DEBUGFILE}") 2>/dev/null || small_die "Genkernel: Could not write to ${DEBUGFILE}."
+    fi   
 }
 
 gen_die() {
diff --git a/genkernel b/genkernel
index 2bafbf5..7a5ca2a 100755
--- a/genkernel
+++ b/genkernel
@@ -371,22 +371,14 @@ fi
 if [ "${BUILD_INITRD}" -eq '1' ]
 then
 	echo
-	if [ "${KERN_24}" != '1' -a  "${CMD_BOOTSPLASH}" != '1' ]
-	then
-	    print_info 1 'The initramfs compiled successfully!'
-	else
-	    print_info 1 'The initrd compiled successfully!'
-	fi
-		echo
-		echo
-		print_info 1 'WARNING... WARNING... WARNING...'
-		print_info 1 'Additional kernel cmdline arguments that *may* be required to boot properly...'
-		[ "${LVM2}" -eq '1' ] && print_info 1 'add "dolvm2" for lvm2 support at boot time'
-		[ "${EVMS2}" -eq '1' ] && print_info 1 'add "doevms" for evms support at boot time'
-		[ "${DMRAID}" -eq '1' ] && print_info 1 'add "dodmraid" for dmraid support at boot time'
-		[ "${DMRAID}" -eq '1' ] && print_info 1 '	or "dodmraid=<additional options>"'
-		[ "${UNIONFS}" -eq '1' ] && print_info 1 'add "unionfs" for dmraid support at boot time'
-		[ "${UNIONFS}" -eq '1' ] && print_info 1 '	or "unionfs=<block_device>"'
+	print_info 1 'WARNING... WARNING... WARNING...'
+	print_info 1 'Additional kernel cmdline arguments that *may* be required to boot properly...'
+	[ "${LVM2}" -eq '1' ] && print_info 1 'add "dolvm2" for lvm2 support at boot time'
+	[ "${EVMS2}" -eq '1' ] && print_info 1 'add "doevms" for evms support at boot time'
+	[ "${DMRAID}" -eq '1' ] && print_info 1 'add "dodmraid" for dmraid support at boot time'
+	[ "${DMRAID}" -eq '1' ] && print_info 1 '	or "dodmraid=<additional options>"'
+	[ "${UNIONFS}" -eq '1' ] && print_info 1 'add "unionfs" for unionfs support at boot time'
+	[ "${UNIONFS}" -eq '1' ] && print_info 1 '	or "unionfs=<block_device>"'
 fi
 
 if [ "${CMD_NOINSTALL}" != '1' -a "${SYMLINK}" = '1' ]