[src/trunk]: src/usr.sbin/postinstall introduce rcvar_is_enabled to test if a...

[plunky <plunky%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2a0cb156712f
branches:  trunk
changeset: 767277:2a0cb156712f
user:      plunky <plunky%NetBSD.org@localhost>
date:      Thu Jul 14 09:31:19 2011 +0000

description:
introduce rcvar_is_enabled to test if a rcvar is enabled

use this instead of rcconf_is_set to warn about superseded
rc.d scripts, to silence spurious warnings produced before
/etc/defaults/rc.conf script was updated.

(spurious warnings noted by Martin Husemann)

diffstat:

 usr.sbin/postinstall/postinstall |  27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)

diffs (50 lines):

diff -r da737d5d8bcc -r 2a0cb156712f usr.sbin/postinstall/postinstall
--- a/usr.sbin/postinstall/postinstall  Thu Jul 14 08:12:20 2011 +0000
+++ b/usr.sbin/postinstall/postinstall  Thu Jul 14 09:31:19 2011 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postinstall,v 1.118 2011/05/27 09:28:42 plunky Exp $
+# $NetBSD: postinstall,v 1.119 2011/07/14 09:31:19 plunky Exp $
 #
 # Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -354,6 +354,29 @@
        )
 }
 
+# rcvar_is_enabled var
+#      Check if rcvar is enabled
+#
+rcvar_is_enabled()
+{
+       [ $# -eq 1 ] || err 3 "USAGE: rcvar_is_enabled var"
+       _rcie_var="$1"
+       (
+               [ -f "${DEST_DIR}/etc/rc.conf" ] && . "${DEST_DIR}/etc/rc.conf"
+               eval _rcie_val="\${${_rcie_var}}"
+               case $_rcie_val in
+               #       "yes", "true", "on", or "1"
+               [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+                       exit 0
+                       ;;
+
+               *)
+                       exit 1
+                       ;;
+               esac
+       )
+}
+
 # find_file_in_dirlist() file message dir1 [...] --
 #      Find which directory file is in, and sets ${dir} to match.
 #      Returns 0 if matched, otherwise 1 (and sets ${dir} to "").
@@ -675,7 +698,7 @@
                notfixed="${NOT_FIXED}"
        fi
        for _v in btattach btconfig btdevctl; do
-               if rcconf_is_set "${op}" "${_v}" "${_v}"; then
+               if rcvar_is_enabled "${_v}"; then
                        msg \
     "${_v} is obsolete in rc.conf(5)${notfixed}: use bluetooth=YES"
                        failed=$(( ${failed} + 1 ))