X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=gen_funcs.sh;h=4f0a0fc25f9cf44b83ae3bbc2e75562f84145c1a;hb=a60e920d61e727b3cab90f1b8079acf556cf77c2;hp=739311b915eb9c325628cec627dc6147c449e43b;hpb=45e8dbfa0e6b193662b2c0273f90e66452c4a102;p=genkernel.git

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 739311b..4f0a0fc 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -204,29 +204,30 @@ gen_die() {
 	then
 		print_error 1 "ERROR: ${1}"
 	fi
-	echo
-	print_info 1 "-- Grepping log... --"
-	echo
+	print_error 1 ''
+	print_error 1 "-- Grepping log... --"
+	print_error 1 ''
 
 	if isTrue ${USECOLOR}
 	then
-		GREP_COLOR='1' grep -B5 -E --colour=always "([Ww][Aa][Rr][Nn][Ii][Nn][Gg]|[Ee][Rr][Rr][Oo][Rr][ :,!]|[Ff][Aa][Ii][Ll][Ee]?[Dd]?)" ${LOGFILE}
+		GREP_COLOR='1' grep -B5 -E --colour=always "([Ww][Aa][Rr][Nn][Ii][Nn][Gg]|[Ee][Rr][Rr][Oo][Rr][ :,!]|[Ff][Aa][Ii][Ll][Ee]?[Dd]?)" ${LOGFILE} \
+				| sed -s "s|^\(*\)\?|${BAD}*${NORMAL}|"
 	else
 		grep -B5 -E "([Ww][Aa][Rr][Nn][Ii][Nn][Gg]|[Ee][Rr][Rr][Oo][Rr][ :,!]|[Ff][Aa][Ii][Ll][Ee]?[Dd]?)" ${LOGFILE}
 	fi
-	echo
-	print_info 1 "-- End log... --"
-	echo
-	print_info 1 "Please consult ${LOGFILE} for more information and any"
-	print_info 1 "errors that were reported above."
-	echo
-	print_info 1 "Report any genkernel bugs to bugs.gentoo.org and"
-	print_info 1 "assign your bug to genkernel@gentoo.org. Please include"
-	print_info 1 "as much information as you can in your bug report; attaching"
-	print_info 1 "${LOGFILE} so that your issue can be dealt with effectively."
-	print_info 1 ''
-	print_info 1 'Please do *not* report compilation failures as genkernel bugs!'
-	print_info 1 ''
+	print_error 1 ''
+	print_error 1 "-- End log... --"
+	print_error 1 ''
+	print_error 1 "Please consult ${LOGFILE} for more information and any"
+	print_error 1 "errors that were reported above."
+	print_error 1 ''
+	print_error 1 "Report any genkernel bugs to bugs.gentoo.org and"
+	print_error 1 "assign your bug to genkernel@gentoo.org. Please include"
+	print_error 1 "as much information as you can in your bug report; attaching"
+	print_error 1 "${LOGFILE} so that your issue can be dealt with effectively."
+	print_error 1 ''
+	print_error 1 'Please do *not* report compilation failures as genkernel bugs!'
+	print_error 1 ''
 
 	# Cleanup temp dirs and caches if requested
 	cleanup
@@ -297,6 +298,7 @@ copy_image_with_preserve() {
 
 	# Old product might be a different version.  If so, we need to read
 	# the symlink to see what it's name is, if there are symlinks.
+	cd ${KERNEL_OUTPUTDIR}
 	if [ "${SYMLINK}" = '1' ]
 	then
  		print_info 4 "automatically managing symlinks and old images." 1 0
@@ -494,7 +496,7 @@ set_config_with_override() {
 }
 
 check_distfiles() {
-	for i in $BUSYBOX_SRCTAR $MULTIPATH_SRCTAR $LVM_SRCTAR $DMRAID_SRCTAR $E2FSPROGS_SRCTAR $ISCSI_SRCTAR $GPG_SRCTAR
+	for i in $BUSYBOX_SRCTAR $MULTIPATH_SRCTAR $LVM_SRCTAR $DMRAID_SRCTAR $ISCSI_SRCTAR $GPG_SRCTAR
 	do
 		if [ ! -f "${i}" ]
 		then
@@ -507,7 +509,7 @@ find_kernel_binary() {
 	local kernel_binary=$*
 	local curdir=$(pwd)
 
-	cd "${KERNEL_DIR}"
+	cd "${KERNEL_OUTPUTDIR}"
 	for i in ${kernel_binary}
 	do
 		if [ -e "${i}" ]