From owner-svn-src-all@FreeBSD.ORG  Tue Dec 25 10:47:59 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 964A4B3D;
 Tue, 25 Dec 2012 10:47:59 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 75FE28FC0C;
 Tue, 25 Dec 2012 10:47:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBPAlxYw039038;
 Tue, 25 Dec 2012 10:47:59 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBPAljFN038947;
 Tue, 25 Dec 2012 10:47:45 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201212251047.qBPAljFN038947@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Tue, 25 Dec 2012 10:47:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244675 - in head/usr.sbin/bsdconfig: . console diskmgmt
 docsinstall dot mouse networking networking/share password password/share
 security share startup startup/share timezone timezone...
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.14
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, 25 Dec 2012 10:47:59 -0000

Author: dteske
Date: Tue Dec 25 10:47:45 2012
New Revision: 244675
URL: http://svnweb.freebsd.org/changeset/base/244675

Log:
  Add more debugging to help with diagnosis of program-flow when needed.

Modified:
  head/usr.sbin/bsdconfig/bsdconfig
  head/usr.sbin/bsdconfig/console/console
  head/usr.sbin/bsdconfig/console/font
  head/usr.sbin/bsdconfig/console/keymap
  head/usr.sbin/bsdconfig/console/repeat
  head/usr.sbin/bsdconfig/console/saver
  head/usr.sbin/bsdconfig/console/screenmap
  head/usr.sbin/bsdconfig/console/ttys
  head/usr.sbin/bsdconfig/diskmgmt/diskmgmt
  head/usr.sbin/bsdconfig/docsinstall/docsinstall
  head/usr.sbin/bsdconfig/dot/dot
  head/usr.sbin/bsdconfig/mouse/disable
  head/usr.sbin/bsdconfig/mouse/enable
  head/usr.sbin/bsdconfig/mouse/flags
  head/usr.sbin/bsdconfig/mouse/mouse
  head/usr.sbin/bsdconfig/mouse/port
  head/usr.sbin/bsdconfig/mouse/type
  head/usr.sbin/bsdconfig/networking/defaultrouter
  head/usr.sbin/bsdconfig/networking/devices
  head/usr.sbin/bsdconfig/networking/hostname
  head/usr.sbin/bsdconfig/networking/nameservers
  head/usr.sbin/bsdconfig/networking/networking
  head/usr.sbin/bsdconfig/networking/share/common.subr
  head/usr.sbin/bsdconfig/networking/share/device.subr
  head/usr.sbin/bsdconfig/networking/share/hostname.subr
  head/usr.sbin/bsdconfig/networking/share/ipaddr.subr
  head/usr.sbin/bsdconfig/networking/share/media.subr
  head/usr.sbin/bsdconfig/networking/share/netmask.subr
  head/usr.sbin/bsdconfig/networking/share/resolv.subr
  head/usr.sbin/bsdconfig/networking/share/routing.subr
  head/usr.sbin/bsdconfig/password/password
  head/usr.sbin/bsdconfig/password/share/password.subr
  head/usr.sbin/bsdconfig/security/kern_securelevel
  head/usr.sbin/bsdconfig/security/security
  head/usr.sbin/bsdconfig/share/common.subr
  head/usr.sbin/bsdconfig/share/dialog.subr
  head/usr.sbin/bsdconfig/share/mustberoot.subr
  head/usr.sbin/bsdconfig/share/strings.subr
  head/usr.sbin/bsdconfig/share/sysrc.subr
  head/usr.sbin/bsdconfig/startup/misc
  head/usr.sbin/bsdconfig/startup/rcadd
  head/usr.sbin/bsdconfig/startup/rcconf
  head/usr.sbin/bsdconfig/startup/rcdelete
  head/usr.sbin/bsdconfig/startup/rcedit
  head/usr.sbin/bsdconfig/startup/rcvar
  head/usr.sbin/bsdconfig/startup/share/rcconf.subr
  head/usr.sbin/bsdconfig/startup/share/rcedit.subr
  head/usr.sbin/bsdconfig/startup/share/rcvar.subr
  head/usr.sbin/bsdconfig/startup/startup
  head/usr.sbin/bsdconfig/timezone/share/continents.subr
  head/usr.sbin/bsdconfig/timezone/share/countries.subr
  head/usr.sbin/bsdconfig/timezone/share/iso3166.subr
  head/usr.sbin/bsdconfig/timezone/share/menus.subr
  head/usr.sbin/bsdconfig/timezone/share/zones.subr
  head/usr.sbin/bsdconfig/timezone/timezone
  head/usr.sbin/bsdconfig/ttys/ttys
  head/usr.sbin/bsdconfig/usermgmt/groupadd
  head/usr.sbin/bsdconfig/usermgmt/groupdel
  head/usr.sbin/bsdconfig/usermgmt/groupedit
  head/usr.sbin/bsdconfig/usermgmt/groupinput
  head/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
  head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
  head/usr.sbin/bsdconfig/usermgmt/useradd
  head/usr.sbin/bsdconfig/usermgmt/userdel
  head/usr.sbin/bsdconfig/usermgmt/useredit
  head/usr.sbin/bsdconfig/usermgmt/userinput
  head/usr.sbin/bsdconfig/usermgmt/usermgmt

Modified: head/usr.sbin/bsdconfig/bsdconfig
==============================================================================
--- head/usr.sbin/bsdconfig/bsdconfig	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/bsdconfig	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/strings.subr
@@ -232,15 +233,6 @@ f_dialog_title "$msg_main_menu"
 # Incorporate rc-file if it exists
 [ -f "$HOME/.bsdconfigrc" ] && f_include "$HOME/.bsdconfigrc"
 
-#
-# Log our operating environment for debugging purposes
-#
-export UNAME_S="$(uname -s)" # Operating System (i.e. FreeBSD)
-export UNAME_P="$(uname -p)" # Processor Architecture (i.e. i386)
-export UNAME_R="$(uname -r)" # Release Level (i.e. X.Y-RELEASE)
-f_dprintf "UNAME_S=[%s] UNAME_P=[%s] UNAME_R=[%s]" \
-          "$UNAME_S" "$UNAME_P" "$UNAME_R"
-
 cd $BSDCFG_LIBE || f_die 1 "$msg_directory_not_found" "$BSDCFG_LIBE"
 
 #

Modified: head/usr.sbin/bsdconfig/console/console
==============================================================================
--- head/usr.sbin/bsdconfig/console/console	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/console/console	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 

Modified: head/usr.sbin/bsdconfig/console/font
==============================================================================
--- head/usr.sbin/bsdconfig/console/font	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/console/font	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/console/keymap
==============================================================================
--- head/usr.sbin/bsdconfig/console/keymap	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/console/keymap	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/console/repeat
==============================================================================
--- head/usr.sbin/bsdconfig/console/repeat	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/console/repeat	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/console/saver
==============================================================================
--- head/usr.sbin/bsdconfig/console/saver	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/console/saver	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/console/screenmap
==============================================================================
--- head/usr.sbin/bsdconfig/console/screenmap	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/console/screenmap	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/console/ttys
==============================================================================
--- head/usr.sbin/bsdconfig/console/ttys	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/console/ttys	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/diskmgmt/diskmgmt
==============================================================================
--- head/usr.sbin/bsdconfig/diskmgmt/diskmgmt	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/diskmgmt/diskmgmt	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 

Modified: head/usr.sbin/bsdconfig/docsinstall/docsinstall
==============================================================================
--- head/usr.sbin/bsdconfig/docsinstall/docsinstall	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/docsinstall/docsinstall	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 

Modified: head/usr.sbin/bsdconfig/dot/dot
==============================================================================
--- head/usr.sbin/bsdconfig/dot/dot	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/dot/dot	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="dot"
 f_include_lang $BSDCFG_LIBE/include/messages.subr

Modified: head/usr.sbin/bsdconfig/mouse/disable
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/disable	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/mouse/disable	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/mouse/enable
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/enable	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/mouse/enable	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/mouse/flags
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/flags	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/mouse/flags	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/mouse/mouse
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/mouse	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/mouse/mouse	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 

Modified: head/usr.sbin/bsdconfig/mouse/port
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/port	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/mouse/port	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/mouse/type
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/type	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/mouse/type	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/networking/defaultrouter
==============================================================================
--- head/usr.sbin/bsdconfig/networking/defaultrouter	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/defaultrouter	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/networking/routing.subr

Modified: head/usr.sbin/bsdconfig/networking/devices
==============================================================================
--- head/usr.sbin/bsdconfig/networking/devices	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/devices	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/networking/hostname
==============================================================================
--- head/usr.sbin/bsdconfig/networking/hostname	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/hostname	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/networking/hostname.subr

Modified: head/usr.sbin/bsdconfig/networking/nameservers
==============================================================================
--- head/usr.sbin/bsdconfig/networking/nameservers	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/nameservers	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/networking/resolv.subr

Modified: head/usr.sbin/bsdconfig/networking/networking
==============================================================================
--- head/usr.sbin/bsdconfig/networking/networking	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/networking	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 

Modified: head/usr.sbin/bsdconfig/networking/share/common.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/common.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/share/common.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -62,4 +62,8 @@ f_nfs_mounted()
 	[ "$( df -t nfs )" ]
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." networking/common.subr
+
 fi # ! $_NETWORKING_COMMON_SUBR

Modified: head/usr.sbin/bsdconfig/networking/share/device.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/device.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/share/device.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_NETWORKING_DEVICE_SUBR" ]; the
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." networking/device.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/sysrc.subr
 f_include $BSDCFG_SHARE/networking/common.subr
@@ -495,4 +496,8 @@ f_dialog_menu_netdev_edit()
 	return $SUCCESS
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." networking/device.subr
+
 fi # ! $_NETWORKING_DEVICE_SUBR

Modified: head/usr.sbin/bsdconfig/networking/share/hostname.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/hostname.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/share/hostname.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_NETWORKING_HOSTNAME_SUBR" ]; t
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." networking/hostname.subr
 f_include $BSDCFG_SHARE/sysrc.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/networking/common.subr
@@ -211,4 +212,8 @@ f_dialog_input_hostname()
 	return $SUCCESS
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." networking/hostname.subr
+
 fi # ! $_NETWORKING_HOSTNAME_SUBR

Modified: head/usr.sbin/bsdconfig/networking/share/ipaddr.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/ipaddr.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/share/ipaddr.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_NETWORKING_IPADDR_SUBR" ]; the
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." networking/ipaddr.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/strings.subr
 f_include $BSDCFG_SHARE/networking/common.subr
@@ -410,4 +411,8 @@ f_dialog_input_ipaddr()
 	return $SUCCESS
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." networking/ipaddr.subr
+
 fi # ! $_NETWORKING_IPADDR_SUBR

Modified: head/usr.sbin/bsdconfig/networking/share/media.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/media.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/share/media.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_NETWORKING_MEDIA_SUBR" ]; then
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." networking/media.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/strings.subr
 f_include $BSDCFG_SHARE/sysrc.subr
@@ -234,4 +235,8 @@ f_dialog_menu_media_options()
 	return $retval
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." networking/media.subr
+
 fi # ! $_NETWORKING_MEDIA_SUBR

Modified: head/usr.sbin/bsdconfig/networking/share/netmask.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/netmask.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/share/netmask.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_NETWORKING_NETMASK_SUBR" ]; th
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." networking/netmask.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/strings.subr
 f_include $BSDCFG_SHARE/networking/common.subr
@@ -209,4 +210,8 @@ f_dialog_input_netmask()
 	netmask="$_netmask"
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." networking/netmask.subr
+
 fi # ! $_NETWORKING_NETMASK_SUBR

Modified: head/usr.sbin/bsdconfig/networking/share/resolv.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/resolv.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/share/resolv.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_NETWORKING_RESOLV_SUBR" ]; the
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." networking/resolv.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/strings.subr
 f_include $BSDCFG_SHARE/networking/common.subr
@@ -488,4 +489,8 @@ f_dialog_menu_nameservers()
 	done
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." networking/resolv.subr
+
 fi # ! $_NETWORKING_RESOLV_SUBR

Modified: head/usr.sbin/bsdconfig/networking/share/routing.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/routing.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/share/routing.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_NETWORKING_ROUTING_SUBR" ]; th
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." networking/routing.subr
 f_include $BSDCFG_SHARE/sysrc.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/networking/common.subr
@@ -147,4 +148,8 @@ f_dialog_input_defaultrouter()
 	fi
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." networking/routing.subr
+
 fi # ! $_NETWORKING_ROUTING_SUBR

Modified: head/usr.sbin/bsdconfig/password/password
==============================================================================
--- head/usr.sbin/bsdconfig/password/password	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/password/password	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/password/password.subr

Modified: head/usr.sbin/bsdconfig/password/share/password.subr
==============================================================================
--- head/usr.sbin/bsdconfig/password/share/password.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/password/share/password.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_PASSWORD_PASSWORD_SUBR" ]; the
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." password/password.subr
 f_include $BSDCFG_SHARE/dialog.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="040.password"
@@ -124,4 +125,8 @@ f_dialog_input_password()
 	return $SUCCESS
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." password/password.subr
+
 fi # ! $_PASSWORD_PASSWORD_SUBR

Modified: head/usr.sbin/bsdconfig/security/kern_securelevel
==============================================================================
--- head/usr.sbin/bsdconfig/security/kern_securelevel	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/security/kern_securelevel	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/security/security
==============================================================================
--- head/usr.sbin/bsdconfig/security/security	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/security/security	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/share/common.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/common.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/share/common.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -55,24 +55,25 @@ ARGV="$@"
 SUCCESS=0
 FAILURE=1
 
+#
+# Operating environment details
+#
+export UNAME_S="$(uname -s)" # Operating System (i.e. FreeBSD)
+export UNAME_P="$(uname -p)" # Processor Architecture (i.e. i386)
+export UNAME_R="$(uname -r)" # Release Level (i.e. X.Y-RELEASE)
+
 ############################################################ FUNCTIONS
 
 #
-# This is an empty function by default, to use it, copy
-# /usr/share/examples/bsdconfig/bsdconfigrc to $HOME/.bsdconfigrc
+# Sensible debug function. Override in ~/.bsdconfigrc if desired.
+# See /usr/share/examples/bsdconfig/bsdconfigrc for example.
 #
 f_dprintf()
 {
-	: this page intentionally left blank
+	[ "$debug" ] || return $SUCCESS
+	local fmt="$1"; shift
+	printf "DEBUG: $fmt${fmt:+\n}" "$@" >&${TERMINAL_STDOUT_PASSTHRU:-1}
 }
-[ "$DEBUGGING" ] && f_dprintf()
-{
-	local fmt="$1"
-	shift
-	printf "$fmt${fmt:+\n}" "$@" \
-		>&${TERMINAL_STDOUT_PASSTHRU:-1}
-} &&
-	export DEBUGGING
 
 # f_err $fmt [ $opts ... ]
 #
@@ -510,4 +511,17 @@ trap '' SIGALRM SIGPROF SIGUSR1 SIGUSR2 
 eval exec $TERMINAL_STDOUT_PASSTHRU\>\&1
 eval exec $TERMINAL_STDERR_PASSTHRU\>\&2
 
+#
+# Make debugging persistant if set
+#
+[ "$debug" ] && export debug
+
+#
+# Log our operating environment for debugging purposes
+#
+f_dprintf "UNAME_S=[%s] UNAME_P=[%s] UNAME_R=[%s]" \
+          "$UNAME_S" "$UNAME_P" "$UNAME_R"
+
+f_dprintf "%s: Successfully loaded." common.subr
+
 fi # ! $_COMMON_SUBR

Modified: head/usr.sbin/bsdconfig/share/dialog.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/dialog.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/share/dialog.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_DIALOG_SUBR" ]; then _DIALOG_S
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." dialog.subr
 f_include $BSDCFG_SHARE/strings.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig"
@@ -1473,13 +1474,19 @@ f_dialog_init()
 		DIALOG_BACKTITLE="$_DIALOG_TITLE"
 		unset _DIALOG_TITLE
 	fi
+
+	f_dprintf "f_dialog_init: dialog(1) API initialized."
 }
 
 ############################################################ MAIN
 
+f_dprintf "%s: DIALOG_SELF_INITIALIZE=[%s]" \
+          dialog.subr "$DIALOG_SELF_INITIALIZE"
 case "$DIALOG_SELF_INITIALIZE" in
 ""|0|[Nn][Oo]|[Oo][Ff][Ff]|[Ff][Aa][Ll][Ss][Ee]) : do nothing ;;
 *) f_dialog_init
 esac
 
+f_dprintf "%s: Successfully loaded." dialog.subr
+
 fi # ! $_DIALOG_SUBR

Modified: head/usr.sbin/bsdconfig/share/mustberoot.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/mustberoot.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/share/mustberoot.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_MUSTBEROOT_SUBR" ]; then _MUST
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." mustberoot.subr
 f_include $BSDCFG_SHARE/dialog.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig"
@@ -419,4 +420,8 @@ f_mustberoot_init()
 	fi
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." mustberoot.subr
+
 fi # ! $_MUSTBEROOT_SUBR

Modified: head/usr.sbin/bsdconfig/share/strings.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/strings.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/share/strings.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -101,4 +101,6 @@ f_isinteger()
 	( : $((0/$arg)) ) > /dev/null 2>&1
 }
 
+f_dprintf "%s: Successfully loaded." strings.subr
+
 fi # ! $_STRINGS_SUBR

Modified: head/usr.sbin/bsdconfig/share/sysrc.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/sysrc.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/share/sysrc.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -32,7 +32,10 @@ BSDCFG_SHARE="/usr/share/bsdconfig"
 [ "$_COMMON_SUBR" ] || . $BSDCFG_SHARE/common.subr || exit 1
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig"
-[ ! "$_SYSRC_JAILED" ] && f_include_lang $BSDCFG_LIBE/include/messages.subr
+if [ ! "$_SYSRC_JAILED" ]; then
+	f_dprintf "%s: loading includes..." sysrc.subr
+	f_include_lang $BSDCFG_LIBE/include/messages.subr
+fi
 
 ############################################################ CONFIGURATION
 
@@ -623,4 +626,8 @@ f_sysrc_delete()
 	done
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." sysrc.subr
+
 fi # ! $_SYSRC_SUBR

Modified: head/usr.sbin/bsdconfig/startup/misc
==============================================================================
--- head/usr.sbin/bsdconfig/startup/misc	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/startup/misc	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/startup/rcadd
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcadd	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/startup/rcadd	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/startup/rcconf.subr

Modified: head/usr.sbin/bsdconfig/startup/rcconf
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcconf	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/startup/rcconf	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/startup/rcdelete
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcdelete	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/startup/rcdelete	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/startup/rcedit
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcedit	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/startup/rcedit	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/startup/rcedit.subr

Modified: head/usr.sbin/bsdconfig/startup/rcvar
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcvar	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/startup/rcvar	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/startup/share/rcconf.subr
==============================================================================
--- head/usr.sbin/bsdconfig/startup/share/rcconf.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/startup/share/rcconf.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_STARTUP_RCCONF_SUBR" ]; then _
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." startup/rcconf.subr
 f_include $BSDCFG_SHARE/sysrc.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="140.startup"
@@ -451,4 +452,8 @@ f_dialog_input_rcvar()
 	return $SUCCESS
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." startup/rcconf.subr
+
 fi # ! $_STARTUP_RCCONF_SUBR

Modified: head/usr.sbin/bsdconfig/startup/share/rcedit.subr
==============================================================================
--- head/usr.sbin/bsdconfig/startup/share/rcedit.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/startup/share/rcedit.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_STARTUP_RCEDIT_SUBR" ]; then _
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." startup/rcedit.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/sysrc.subr
 
@@ -81,4 +82,8 @@ f_dialog_rcedit()
 		f_show_msg "$err"
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." startup/rcedit.subr
+
 fi # ! $_STARTUP_RCEDIT_SUBR

Modified: head/usr.sbin/bsdconfig/startup/share/rcvar.subr
==============================================================================
--- head/usr.sbin/bsdconfig/startup/share/rcvar.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/startup/share/rcvar.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_STARTUP_RCVAR_SUBR" ]; then _S
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." startup/rcvar.subr
 f_include $BSDCFG_SHARE/sysrc.subr
 
 ############################################################ CONFIGURATION
@@ -203,4 +204,8 @@ f_startup_rcvar_map()
 	mv "$tmpfile" "$STARTUP_RCVAR_MAP_CACHEFILE"
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." startup/rcvar.subr
+
 fi # ! $_STARTUP_RCVAR_SUBR

Modified: head/usr.sbin/bsdconfig/startup/startup
==============================================================================
--- head/usr.sbin/bsdconfig/startup/startup	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/startup/startup	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 

Modified: head/usr.sbin/bsdconfig/timezone/share/continents.subr
==============================================================================
--- head/usr.sbin/bsdconfig/timezone/share/continents.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/timezone/share/continents.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_TIMEZONE_CONTINENTS_SUBR" ]; t
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." timezone/continents.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="090.timezone"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
@@ -135,4 +136,8 @@ f_OCEANP()
 	esac
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." timezone/continents.subr
+
 fi # ! $_TIMEZONE_CONTINENTS_SUBR

Modified: head/usr.sbin/bsdconfig/timezone/share/countries.subr
==============================================================================
--- head/usr.sbin/bsdconfig/timezone/share/countries.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/timezone/share/countries.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -75,4 +75,6 @@ f_sort_countries()
 	export COUNTRIES
 }
 
+f_dprintf "%s: Successfully loaded." timezone/countries.subr
+
 fi # ! $_TIMEZONE_COUNTRIES_SUBR

Modified: head/usr.sbin/bsdconfig/timezone/share/iso3166.subr
==============================================================================
--- head/usr.sbin/bsdconfig/timezone/share/iso3166.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/timezone/share/iso3166.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_TIMEZONE_ISO3166_SUBR" ]; then
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." timezone/iso3166.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="090.timezone"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
@@ -194,4 +195,8 @@ f_read_iso3166_table()
 	            "$_PATH_ISO3166"            )
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." timezone/iso3166.subr
+
 fi # ! $_TIMEZONE_ISO3166_SUBR

Modified: head/usr.sbin/bsdconfig/timezone/share/menus.subr
==============================================================================
--- head/usr.sbin/bsdconfig/timezone/share/menus.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/timezone/share/menus.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_TIMEZONE_MENUS_SUBR" ]; then _
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." timezone/menus.subr
 f_include $BSDCFG_SHARE/dialog.subr
 
 ############################################################ GLOBALS
@@ -217,4 +218,8 @@ f_make_menus()
 	eval $( :| awk "$f_make_menus_awk" )
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." timezone/menus.subr
+
 fi # ! $_TIMEZONE_MENUS_SUBR

Modified: head/usr.sbin/bsdconfig/timezone/share/zones.subr
==============================================================================
--- head/usr.sbin/bsdconfig/timezone/share/zones.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/timezone/share/zones.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_TIMEZONE_ZONES_SUBR" ]; then _
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." timezone/zones.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/timezone/continents.subr
 
@@ -667,4 +668,8 @@ f_set_zone_utc()
 	f_install_zoneinfo_file ""
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." timezone/zones.subr
+
 fi # ! $_TIMEZONE_ZONES_SUBR

Modified: head/usr.sbin/bsdconfig/timezone/timezone
==============================================================================
--- head/usr.sbin/bsdconfig/timezone/timezone	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/timezone/timezone	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/strings.subr

Modified: head/usr.sbin/bsdconfig/ttys/ttys
==============================================================================
--- head/usr.sbin/bsdconfig/ttys/ttys	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/ttys/ttys	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 

Modified: head/usr.sbin/bsdconfig/usermgmt/groupadd
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/groupadd	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/usermgmt/groupadd	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"

Modified: head/usr.sbin/bsdconfig/usermgmt/groupdel
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/groupdel	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/usermgmt/groupdel	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/usermgmt/group_input.subr

Modified: head/usr.sbin/bsdconfig/usermgmt/groupedit
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/groupedit	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/usermgmt/groupedit	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/usermgmt/group_input.subr

Modified: head/usr.sbin/bsdconfig/usermgmt/groupinput
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/groupinput	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/usermgmt/groupinput	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/usermgmt/group_input.subr

Modified: head/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/share/group_input.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/usermgmt/share/group_input.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@ if [ ! "$_USERMGMT_GROUP_INPUT_SUBR" ]; 
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." usermgmt/group_input.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/strings.subr
 
@@ -392,4 +393,8 @@ f_dialog_input_group_members()
 	return $SUCCESS
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." usermgmt/group_input.subr
+
 fi # ! $_USERMGMT_GROUP_INPUT_SUBR

Modified: head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@ if [ ! "$_USERMGMT_USER_INPUT_SUBR" ]; t
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." usermgmt/user_input.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/strings.subr
 
@@ -1025,4 +1026,8 @@ f_dialog_input_shell()
 	return $SUCCESS
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." usermgmt/user_input.subr
+
 fi # ! $_USERMGMT_USER_INPUT_SUBR

Modified: head/usr.sbin/bsdconfig/usermgmt/useradd
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/useradd	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/usermgmt/useradd	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"

Modified: head/usr.sbin/bsdconfig/usermgmt/userdel
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/userdel	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/usermgmt/userdel	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/usermgmt/user_input.subr

Modified: head/usr.sbin/bsdconfig/usermgmt/useredit
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/useredit	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/usermgmt/useredit	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/usermgmt/user_input.subr

Modified: head/usr.sbin/bsdconfig/usermgmt/userinput
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/userinput	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/usermgmt/userinput	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/usermgmt/user_input.subr

Modified: head/usr.sbin/bsdconfig/usermgmt/usermgmt
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/usermgmt	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/usermgmt/usermgmt	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr