Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 17 Dec 2008 17:35:15 +0000 (UTC)
From:      Brooks Davis <brooks@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r186237 - head/etc/rc.d
Message-ID:  <200812171735.mBHHZFxh010314@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brooks
Date: Wed Dec 17 17:35:14 2008
New Revision: 186237
URL: http://svn.freebsd.org/changeset/base/186237

Log:
  Correct a bug where /etc/rc.d/defaultroute fails to finish by printing a
  newline when it fails to obtain an address via DHCP. This made the next
  rc script begin its output on the same line.
  
  PR:		conf
  Submitted by:	Bruce Cran <bruce at cran dot org dot uk>
  MFC after:	3 days

Modified:
  head/etc/rc.d/defaultroute

Modified: head/etc/rc.d/defaultroute
==============================================================================
--- head/etc/rc.d/defaultroute	Wed Dec 17 16:55:58 2008	(r186236)
+++ head/etc/rc.d/defaultroute	Wed Dec 17 17:35:14 2008	(r186237)
@@ -30,7 +30,7 @@ defaultroute_start()
 		defif=`get_default_if -inet`
 		if [ -n "${defif}" ]; then
 			if [ ${delay} -ne ${if_up_delay} ]; then
-				echo "($defif)"
+				echo -n "($defif)"
 			fi
 			break
 		fi
@@ -42,6 +42,8 @@ defaultroute_start()
 		sleep 1
 		delay=`expr $delay - 1`
 	done
+
+	echo
 }
 
 load_rc_config $name



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812171735.mBHHZFxh010314>