From: Ben Gras <ben@minix3.org>
Date: Mon, 8 Aug 2005 16:56:40 +0000 (+0000)
Subject: Took hostaddr out of the loop; if it fails after 10 secs, continue
X-Git-Tag: v3.1.0~397
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/Bv9ARM.html?a=commitdiff_plain;h=ddb8e7300d980b20cf538329d54a552ace9062e5;p=minix.git

Took hostaddr out of the loop; if it fails after 10 secs, continue
startup script. (ast@)
---

diff --git a/etc/usr/rc b/etc/usr/rc
index 40f57f44d..29280e313 100644
--- a/etc/usr/rc
+++ b/etc/usr/rc
@@ -143,27 +143,8 @@ start)
     if [ "$net" ]
     then
 	# Get the nodename from the DNS and set it.
-	t='-t 10'
 	trap '' 2
-	while :;
-	do
-	    intr $t hostaddr -h
-
-	    case $? in
-	    142)
-		echo "\
-Unable to obtain an IP address after 10 seconds.  Hit DEL to get a root
-prompt to investigate, otherwise just wait until an address is received..."
-		t=
-		;;
-	    130)
-		echo "Single user."
-		intr sh
-		echo "Continue waiting for an address..."
-		;;
-	    *)	break
-	    esac
-	done
+	intr -t 10 hostaddr -h || echo "Unable to obtain an IP address."
 	trap 2
     fi