svn commit: r252746 - in head/usr.sbin/bsdconfig: networking/share share

[Devin Teske]

Author: dteske
Date: Fri Jul  5 01:49:20 2013
New Revision: 252746
URL: http://svnweb.freebsd.org/changeset/base/252746

Log:
  Add the beginnings of the old networking services functionality of
  sysinstall(8). The UI for this will come later while this exposes the
  functionality to the scripted interface. Tested successfully to first
  install the pcnfsd package from the `Latest' repository, and second to
  configure mountd_flags="-n" in rc.conf(5).

Added:
  head/usr.sbin/bsdconfig/networking/share/services.subr   (contents, props changed)
Modified:
  head/usr.sbin/bsdconfig/networking/share/Makefile
  head/usr.sbin/bsdconfig/share/script.subr

Modified: head/usr.sbin/bsdconfig/networking/share/Makefile
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/Makefile	Fri Jul  5 01:44:59 2013	(r252745)
+++ head/usr.sbin/bsdconfig/networking/share/Makefile	Fri Jul  5 01:49:20 2013	(r252746)
@@ -4,7 +4,7 @@ NO_OBJ=
 
 FILESDIR=	${SHAREDIR}/bsdconfig/networking
 FILES=		common.subr device.subr hostname.subr ipaddr.subr media.subr \
-		netmask.subr resolv.subr routing.subr
+		netmask.subr resolv.subr routing.subr services.subr
 
 beforeinstall:
 	mkdir -p ${DESTDIR}${FILESDIR}

Added: head/usr.sbin/bsdconfig/networking/share/services.subr
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.sbin/bsdconfig/networking/share/services.subr	Fri Jul  5 01:49:20 2013	(r252746)
@@ -0,0 +1,54 @@
+if [ ! "$_NETWORKING_SERVICES_SUBR" ]; then _NETWORKING_SERVICES_SUBR=1
+#
+# Copyright (c) 2013 Devin Teske
+# All Rights Reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+#
+############################################################ INCLUDES
+
+BSDCFG_SHARE="/usr/share/bsdconfig"
+. $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." networking/services.subr
+f_include $BSDCFG_SHARE/packages/packages.subr
+f_include $BSDCFG_SHARE/sysrc.subr
+
+############################################################ FUNCTIONS
+
+# f_config_pcnfsd
+#
+# Load pcnfsd package and adjust mountd_flags in rc.conf(5).
+#
+f_config_pcnfsd()
+{
+	f_package_add "pcnfsd" || return $?
+	f_sysrc_set mountd_flags "-n"
+	return $SUCCESS
+}
+
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." networking/services.subr
+
+fi # ! $_NETWORKING_SERVICES_SUBR

Modified: head/usr.sbin/bsdconfig/share/script.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/script.subr	Fri Jul  5 01:44:59 2013	(r252745)
+++ head/usr.sbin/bsdconfig/share/script.subr	Fri Jul  5 01:49:20 2013	(r252746)
@@ -35,6 +35,7 @@ f_include $BSDCFG_SHARE/device.subr
 f_include $BSDCFG_SHARE/media/any.subr
 f_include $BSDCFG_SHARE/media/tcpip.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
+f_include $BSDCFG_SHARE/networking/services.subr
 f_include $BSDCFG_SHARE/packages/packages.subr
 f_include $BSDCFG_SHARE/variable.subr
 
@@ -188,6 +189,9 @@ f_resword_new mediaSetHTTP	f_media_set_h
 # media/httpproxy.subr
 f_resword_new mediaSetHTTPProxy	f_media_set_http_proxy
 
+# networking/services.subr
+f_resword_new configPCNFSD	f_config_pcnfsd
+
 # packages/packages.subr
 f_resword_new configPackages	f_package_config
 f_resword_new packageAdd	f_package_add