svn commit: r269034 - stable/9/etc

[Devin Teske]

Author: dteske
Date: Wed Jul 23 22:41:07 2014
New Revision: 269034
URL: http://svnweb.freebsd.org/changeset/base/269034

Log:
  MFC r266475 (rea): 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

Modified:
  stable/9/etc/network.subr
Directory Properties:
  stable/9/etc/   (props changed)

Modified: stable/9/etc/network.subr
==============================================================================
--- stable/9/etc/network.subr	Wed Jul 23 22:35:23 2014	(r269033)
+++ stable/9/etc/network.subr	Wed Jul 23 22:41:07 2014	(r269034)
@@ -144,7 +144,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}"
 			;;
@@ -1045,7 +1045,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
@@ -1063,9 +1063,8 @@ ifalias_af_common()
 			;;
 			alias:*)
 				_aliasn="${_aliasn} inet6 ${ifconfig_args}"
-				warn "\$ipv6_ifconfig_${_vif}_alias${alias} " \
-				    "is obsolete.  Use ifconfig_${_vif}_aliasN " \
-				    "instead."
+				warn "\$${alias} is obsolete. " \
+				    "Use ifconfig_${_vif}_aliasN instead."
 			;;
 			esac
 		done