Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Oct 2012 22:32:27 +0000 (UTC)
From:      Doug Barton <dougb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r241210 - in stable/7/etc: . rc.d
Message-ID:  <201210042232.q94MWRFh036056@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dougb
Date: Thu Oct  4 22:32:27 2012
New Revision: 241210
URL: http://svn.freebsd.org/changeset/base/241210

Log:
  MFC r229822:
  
  There is no longer a need to abstract ${rcvar_manpage} as we are not
  attempting to maintain compatibility with NetBSD for some years now.

Modified:
  stable/7/etc/rc.d/hostname
  stable/7/etc/rc.subr
Directory Properties:
  stable/7/etc/   (props changed)

Modified: stable/7/etc/rc.d/hostname
==============================================================================
--- stable/7/etc/rc.d/hostname	Thu Oct  4 22:32:12 2012	(r241209)
+++ stable/7/etc/rc.d/hostname	Thu Oct  4 22:32:27 2012	(r241210)
@@ -65,7 +65,7 @@ hostname_start()
 		# Null hostname is probably OK if DHCP is in use.
 		#
 		if [ -z "`list_net_interfaces dhcp`" ]; then
-			warn "\$hostname is not set -- see ${rcvar_manpage}."
+			warn "\$hostname is not set -- see rc.conf(5)."
 		fi
 		return
 	fi

Modified: stable/7/etc/rc.subr
==============================================================================
--- stable/7/etc/rc.subr	Thu Oct  4 22:32:12 2012	(r241209)
+++ stable/7/etc/rc.subr	Thu Oct  4 22:32:27 2012	(r241210)
@@ -39,7 +39,6 @@
 #	functions used by various rc scripts
 #
 
-: ${rcvar_manpage:='rc.conf(5)'}
 : ${RC_PID:=$$}; export RC_PID
 
 #
@@ -143,7 +142,7 @@ checkyesno()
 		return 1
 		;;
 	*)
-		warn "\$${1} is not set properly - see ${rcvar_manpage}."
+		warn "\$${1} is not set properly - see rc.conf(5)."
 		return 1
 		;;
 	esac



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