From f869380d2dd0a3973345ce587c59ef7e06d92a0b Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 2 May 2013 13:15:15 +0000
Subject: init: minor cleanup. improve error reporting

---
 initramfs-init.in | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/initramfs-init.in b/initramfs-init.in
index 0626f6c..fa629d2 100755
--- a/initramfs-init.in
+++ b/initramfs-init.in
@@ -281,19 +281,21 @@ configure_ip() {
 	local netmask="$4"
 	local device="$6"
 	local autoconf="$7"
-	[ "$client_ip" = "off" -o "$client_ip" = "none" ] && return
-	if [ "$client_ip" = "dhcp" ]; then
-		autoconf="dhcp"
-		client_ip=
-	fi
+	case "$client_ip" in
+		off|none|'') return;;
+		dhcp) autoconf="dhcp";;
+	esac
 
 	[ -n "$device" ] || device=$(ip_choose_if)
-	[ -n "$device" ] || return
+	if [ -z "$device" ]; then
+		echo "ERROR: IP requested but no network device was found"
+		return 1
+	fi
 
 	if [ "$autoconf" = "dhcp" ]; then
 		if [ ! -e /usr/share/udhcpc/default.script ]; then
 			echo "ERROR: DHCP requested but not present in initrd"
-			return
+			return 1
 		fi
 		# automatic configuration
 		ebegin "Obtaining IP via DHCP ($device)..."
-- 
cgit v1.2.3