From owner-svn-src-all@FreeBSD.ORG  Tue May 20 19:55:59 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DF166570;
 Tue, 20 May 2014 19:55:59 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CC5D02B3D;
 Tue, 20 May 2014 19:55:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4KJtxIB057112;
 Tue, 20 May 2014 19:55:59 GMT (envelope-from rea@svn.freebsd.org)
Received: (from rea@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4KJtx65057111;
 Tue, 20 May 2014 19:55:59 GMT (envelope-from rea@svn.freebsd.org)
Message-Id: <201405201955.s4KJtx65057111@svn.freebsd.org>
From: Eygene Ryabinkin <rea@FreeBSD.org>
Date: Tue, 20 May 2014 19:55:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r266475 - head/etc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 May 2014 19:56:00 -0000

Author: rea (ports committer)
Date: Tue May 20 19:55:59 2014
New Revision: 266475
URL: http://svnweb.freebsd.org/changeset/base/266475

Log:
  Fix warning messages after r252015
  
  $alias used to hold alias number, but now it carries full variable name,
  so messages were tuned to account for that.
  
  Other fixes:
   - eliminate unneeded double spaces;
   - tell user where inet/inet6 keywords are expected to be.
  Reviewed by:	hrs
  MFC after:	1 week

Modified:
  head/etc/network.subr

Modified: head/etc/network.subr
==============================================================================
--- head/etc/network.subr	Tue May 20 19:55:06 2014	(r266474)
+++ head/etc/network.subr	Tue May 20 19:55:59 2014	(r266475)
@@ -184,7 +184,7 @@ ifconfig_up()
 			# backward compatibility: inet6 keyword
 			case "${ifconfig_args}" in
 			:*|[0-9a-fA-F]*:*)
-				warn "\$ifconfig_$1_ipv6 needs " \
+				warn "\$ifconfig_$1_ipv6 needs leading" \
 				    "\"inet6\" keyword for an IPv6 address."
 				ifconfig_args="inet6 ${ifconfig_args}"
 			;;
@@ -1110,7 +1110,7 @@ ifalias_af_common()
 			;;
 		inet:alias:"":*)
 			_aliasn="$_aliasn inet $ifconfig_args"
-			warn "\$ifconfig_${_if}_alias${alias} needs " \
+			warn "\$${alias} needs leading" \
 			    "\"inet\" keyword for an IPv4 address."
 		esac
 	done
@@ -1128,9 +1128,8 @@ ifalias_af_common()
 			;;
 			alias:*)
 				_aliasn="${_aliasn} inet6 ${ifconfig_args}"
-				warn "\$ipv6_ifconfig_${_if}_alias${alias} " \
-				    "is obsolete.  Use ifconfig_$1_aliasN " \
-				    "instead."
+				warn "\$${alias} is obsolete. " \
+				    "Use ifconfig_$1_aliasN instead."
 			;;
 			esac
 		done