From 9fdd2e7f93f5c4abbc1ea97498dc71afec9a127e Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tobias@T-POWA-LX.(none)>
Date: Sun, 4 Jan 2009 16:07:50 +0100
Subject: [PATCH] ' fixed network listing'' fixed network listing'' fixed
 network listing'' fixed network listing'

---
 usr/share/archboot/installer/setup |  4 ++--
 usr/share/archboot/keymap/km       | 12 +-----------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup
index 1ff9f878a..ba6f51abc 100755
--- a/usr/share/archboot/installer/setup
+++ b/usr/share/archboot/installer/setup
@@ -549,7 +549,7 @@ autoprepare() {
 	printk off
 	DIALOG --infobox "Partitioning $DEVICE" 0 0
 	# clean partitiontable to avoid issues!
-	dd if=/dev/zero of=$DEVICE bs=512 count=1
+	dd if=/dev/zero of=$DEVICE bs=512 count=1 >/dev/null 2>&1
 	sfdisk $DEVICE -uM >$LOG 2>&1 <<EOF
 $sfdisk_input
 EOF
@@ -1111,7 +1111,7 @@ donetwork() {
 		fi
 	fi
 	while [ "$INTERFACE" = "" ]; do
-		DIALOG --msgbox "Available Ethernet Interfaces:\n$(ifconfig -a | egrep "Ethernet" | sed 's# #_#g')\n\nIf your ethernet interface is not listed,\n1) Probe for the correct module now.\n2) Switch to another VC (ALT-F2) and load your module with\n   the modprobe command, then switch back here (ALT-F1)\n" 0 0
+		DIALOG --msgbox "Available Ethernet Interfaces:\n$(ifconfig -a | grep "Link encap:Ethernet"| sed 's/ \+Link encap:Ethernet \+HWaddr \+/ /g')\n\nIf your ethernet interface is not listed,\n1) Probe for the correct module now.\n2) Switch to another VC (ALT-F2) and load your module with\n   the modprobe command, then switch back here (ALT-F1)\n" 0 0
 		ifaces=$(ifconfig -a | grep "Link encap:Ethernet"| sed 's/ \+Link encap:Ethernet \+HWaddr \+/ /g')
 		DIALOG --extra-button --extra-label "Probe" --ok-label "Select" --menu "Select a network interface" 14 55 7 $ifaces 2>$ANSWER
 		case $? in
diff --git a/usr/share/archboot/keymap/km b/usr/share/archboot/keymap/km
index 9c7bfe7b6..5919af417 100755
--- a/usr/share/archboot/keymap/km
+++ b/usr/share/archboot/keymap/km
@@ -31,11 +31,6 @@ error_kmset()
 	DIALOG --msgbox "An error occured, your current keymap was not changed." 0 0
 }
 
-error_consoleset()
-{
-	DIALOG --msgbox "An error occured, your current consolefont was not changed." 0 0
-}
-
 dokeymap() {
 	echo "Scanning for keymaps..."
 	KEYMAPS=
@@ -72,12 +67,7 @@ doconsolefont() {
 				setfont $BASEDIR/consolefonts/$font -C /dev/tty${i}
 			fi
 		done
-		if [ $? -gt 0 ]; then
-			error_consoleset
-		fi
-		if [ -e /dev/ttyS0 ]; then 
-			setfont $BASEDIR/consolefonts/$font -C /dev/ttyS0 || error_consoleset
-		fi
+		[ -e /dev/ttyS0 ] && setfont $BASEDIR/consolefonts/$font -C /dev/ttyS0
 	fi
 S_NEXTITEM=3
 }