Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 20 May 2014 19:55:59 +0000 (UTC)
From:      Eygene Ryabinkin <rea@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r266475 - head/etc
Message-ID:  <201405201955.s4KJtx65057111@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



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