Date: Tue, 18 Sep 2012 22:28:43 +0000 (UTC) From: Devin Teske <dteske@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r240684 - in head/usr.sbin/bsdconfig: . console diskmgmt docsinstall dot include mouse networking networking/include networking/share password password/include password/share security s... Message-ID: <201209182228.q8IMShup073845@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dteske Date: Tue Sep 18 22:28:42 2012 New Revision: 240684 URL: http://svn.freebsd.org/changeset/base/240684 Log: Move major includes into /usr/share/bsdconfig for easy external access. Reviewed by: adrian (co-mentor) Approved by: adrian (co-mentor) Added: head/usr.sbin/bsdconfig/networking/share/ head/usr.sbin/bsdconfig/networking/share/Makefile (contents, props changed) head/usr.sbin/bsdconfig/networking/share/common.subr - copied, changed from r239358, head/usr.sbin/bsdconfig/networking/include/common.subr head/usr.sbin/bsdconfig/networking/share/device.subr - copied, changed from r239358, head/usr.sbin/bsdconfig/networking/include/device.subr head/usr.sbin/bsdconfig/networking/share/hostname.subr - copied, changed from r239358, head/usr.sbin/bsdconfig/networking/include/hostname.subr head/usr.sbin/bsdconfig/networking/share/ipaddr.subr - copied, changed from r239358, head/usr.sbin/bsdconfig/networking/include/ipaddr.subr head/usr.sbin/bsdconfig/networking/share/media.subr - copied, changed from r240679, head/usr.sbin/bsdconfig/networking/include/media.subr head/usr.sbin/bsdconfig/networking/share/netmask.subr - copied, changed from r239358, head/usr.sbin/bsdconfig/networking/include/netmask.subr head/usr.sbin/bsdconfig/networking/share/resolv.subr - copied, changed from r239358, head/usr.sbin/bsdconfig/networking/include/resolv.subr head/usr.sbin/bsdconfig/networking/share/routing.subr - copied, changed from r239358, head/usr.sbin/bsdconfig/networking/include/routing.subr head/usr.sbin/bsdconfig/password/share/ head/usr.sbin/bsdconfig/password/share/Makefile (contents, props changed) head/usr.sbin/bsdconfig/password/share/password.subr - copied, changed from r239358, head/usr.sbin/bsdconfig/password/include/password.subr head/usr.sbin/bsdconfig/share/ head/usr.sbin/bsdconfig/share/Makefile (contents, props changed) head/usr.sbin/bsdconfig/share/common.subr - copied unchanged from r239358, head/usr.sbin/bsdconfig/include/common.subr head/usr.sbin/bsdconfig/share/dialog.subr - copied, changed from r239358, head/usr.sbin/bsdconfig/include/dialog.subr head/usr.sbin/bsdconfig/share/mustberoot.subr - copied, changed from r239358, head/usr.sbin/bsdconfig/include/mustberoot.subr head/usr.sbin/bsdconfig/share/strings.subr - copied unchanged from r239358, head/usr.sbin/bsdconfig/include/strings.subr head/usr.sbin/bsdconfig/share/sysrc.subr - copied, changed from r239358, head/usr.sbin/bsdconfig/include/sysrc.subr head/usr.sbin/bsdconfig/startup/share/ head/usr.sbin/bsdconfig/startup/share/Makefile (contents, props changed) head/usr.sbin/bsdconfig/startup/share/rcconf.subr - copied, changed from r239358, head/usr.sbin/bsdconfig/startup/include/rcconf.subr head/usr.sbin/bsdconfig/startup/share/rcedit.subr - copied, changed from r239358, head/usr.sbin/bsdconfig/startup/include/rcedit.subr head/usr.sbin/bsdconfig/startup/share/rcvar.subr - copied, changed from r239358, head/usr.sbin/bsdconfig/startup/include/rcvar.subr head/usr.sbin/bsdconfig/timezone/share/ head/usr.sbin/bsdconfig/timezone/share/Makefile (contents, props changed) head/usr.sbin/bsdconfig/timezone/share/continents.subr - copied, changed from r239358, head/usr.sbin/bsdconfig/timezone/include/continents.subr head/usr.sbin/bsdconfig/timezone/share/countries.subr - copied unchanged from r239358, head/usr.sbin/bsdconfig/timezone/include/countries.subr head/usr.sbin/bsdconfig/timezone/share/iso3166.subr - copied, changed from r239358, head/usr.sbin/bsdconfig/timezone/include/iso3166.subr head/usr.sbin/bsdconfig/timezone/share/menus.subr - copied, changed from r239358, head/usr.sbin/bsdconfig/timezone/include/menus.subr head/usr.sbin/bsdconfig/timezone/share/zones.subr - copied, changed from r239358, head/usr.sbin/bsdconfig/timezone/include/zones.subr head/usr.sbin/bsdconfig/usermgmt/share/ head/usr.sbin/bsdconfig/usermgmt/share/Makefile (contents, props changed) head/usr.sbin/bsdconfig/usermgmt/share/group_input.subr - copied, changed from r239358, head/usr.sbin/bsdconfig/usermgmt/include/group_input.subr head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr - copied, changed from r239358, head/usr.sbin/bsdconfig/usermgmt/include/user_input.subr Deleted: head/usr.sbin/bsdconfig/include/common.subr head/usr.sbin/bsdconfig/include/dialog.subr head/usr.sbin/bsdconfig/include/mustberoot.subr head/usr.sbin/bsdconfig/include/strings.subr head/usr.sbin/bsdconfig/include/sysrc.subr head/usr.sbin/bsdconfig/networking/include/common.subr head/usr.sbin/bsdconfig/networking/include/device.subr head/usr.sbin/bsdconfig/networking/include/hostname.subr head/usr.sbin/bsdconfig/networking/include/ipaddr.subr head/usr.sbin/bsdconfig/networking/include/media.subr head/usr.sbin/bsdconfig/networking/include/netmask.subr head/usr.sbin/bsdconfig/networking/include/resolv.subr head/usr.sbin/bsdconfig/networking/include/routing.subr head/usr.sbin/bsdconfig/password/include/password.subr head/usr.sbin/bsdconfig/startup/include/rcconf.subr head/usr.sbin/bsdconfig/startup/include/rcedit.subr head/usr.sbin/bsdconfig/startup/include/rcvar.subr head/usr.sbin/bsdconfig/timezone/include/continents.subr head/usr.sbin/bsdconfig/timezone/include/countries.subr head/usr.sbin/bsdconfig/timezone/include/iso3166.subr head/usr.sbin/bsdconfig/timezone/include/menus.subr head/usr.sbin/bsdconfig/timezone/include/zones.subr head/usr.sbin/bsdconfig/usermgmt/include/group_input.subr head/usr.sbin/bsdconfig/usermgmt/include/user_input.subr Modified: head/usr.sbin/bsdconfig/Makefile 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/include/Makefile 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/Makefile head/usr.sbin/bsdconfig/networking/defaultrouter head/usr.sbin/bsdconfig/networking/devices head/usr.sbin/bsdconfig/networking/hostname head/usr.sbin/bsdconfig/networking/include/Makefile head/usr.sbin/bsdconfig/networking/nameservers head/usr.sbin/bsdconfig/networking/networking head/usr.sbin/bsdconfig/password/Makefile head/usr.sbin/bsdconfig/password/include/Makefile head/usr.sbin/bsdconfig/password/password head/usr.sbin/bsdconfig/security/kern_securelevel head/usr.sbin/bsdconfig/security/security head/usr.sbin/bsdconfig/startup/Makefile head/usr.sbin/bsdconfig/startup/include/Makefile 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/startup head/usr.sbin/bsdconfig/timezone/Makefile head/usr.sbin/bsdconfig/timezone/include/Makefile head/usr.sbin/bsdconfig/timezone/timezone head/usr.sbin/bsdconfig/ttys/ttys head/usr.sbin/bsdconfig/usermgmt/Makefile 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/include/Makefile 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/Makefile ============================================================================== --- head/usr.sbin/bsdconfig/Makefile Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/Makefile Tue Sep 18 22:28:42 2012 (r240684) @@ -12,6 +12,7 @@ SUBDIR= console \ networking \ password \ security \ + share \ startup \ timezone \ ttys \ Modified: head/usr.sbin/bsdconfig/bsdconfig ============================================================================== --- head/usr.sbin/bsdconfig/bsdconfig Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/bsdconfig Tue Sep 18 22:28:42 2012 (r240684) @@ -29,11 +29,13 @@ # ############################################################ INCLUDES +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr +f_include $BSDCFG_SHARE/strings.subr + BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr -f_include $BSDCFG_LIBE/include/strings.subr f_include_lang $BSDCFG_LIBE/include/messages.subr ############################################################ FUNCTIONS Modified: head/usr.sbin/bsdconfig/console/console ============================================================================== --- head/usr.sbin/bsdconfig/console/console Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/console/console Tue Sep 18 22:28:42 2012 (r240684) @@ -28,12 +28,12 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr -APP_DIR="080.console" +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="080.console" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) Modified: head/usr.sbin/bsdconfig/console/font ============================================================================== --- head/usr.sbin/bsdconfig/console/font Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/console/font Tue Sep 18 22:28:42 2012 (r240684) @@ -28,13 +28,13 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr -f_include $BSDCFG_LIBE/include/sysrc.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr +f_include $BSDCFG_SHARE/sysrc.subr -APP_DIR="080.console" +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="080.console" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) Modified: head/usr.sbin/bsdconfig/console/keymap ============================================================================== --- head/usr.sbin/bsdconfig/console/keymap Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/console/keymap Tue Sep 18 22:28:42 2012 (r240684) @@ -28,13 +28,13 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr -f_include $BSDCFG_LIBE/include/sysrc.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr +f_include $BSDCFG_SHARE/sysrc.subr -APP_DIR="080.console" +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="080.console" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) Modified: head/usr.sbin/bsdconfig/console/repeat ============================================================================== --- head/usr.sbin/bsdconfig/console/repeat Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/console/repeat Tue Sep 18 22:28:42 2012 (r240684) @@ -28,13 +28,13 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr -f_include $BSDCFG_LIBE/include/sysrc.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr +f_include $BSDCFG_SHARE/sysrc.subr -APP_DIR="080.console" +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="080.console" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) Modified: head/usr.sbin/bsdconfig/console/saver ============================================================================== --- head/usr.sbin/bsdconfig/console/saver Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/console/saver Tue Sep 18 22:28:42 2012 (r240684) @@ -28,13 +28,13 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr -f_include $BSDCFG_LIBE/include/sysrc.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr +f_include $BSDCFG_SHARE/sysrc.subr -APP_DIR="080.console" +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="080.console" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) Modified: head/usr.sbin/bsdconfig/console/screenmap ============================================================================== --- head/usr.sbin/bsdconfig/console/screenmap Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/console/screenmap Tue Sep 18 22:28:42 2012 (r240684) @@ -28,13 +28,13 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr -f_include $BSDCFG_LIBE/include/sysrc.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr +f_include $BSDCFG_SHARE/sysrc.subr -APP_DIR="080.console" +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="080.console" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) Modified: head/usr.sbin/bsdconfig/console/ttys ============================================================================== --- head/usr.sbin/bsdconfig/console/ttys Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/console/ttys Tue Sep 18 22:28:42 2012 (r240684) @@ -28,13 +28,13 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr -f_include $BSDCFG_LIBE/include/sysrc.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr +f_include $BSDCFG_SHARE/sysrc.subr -APP_DIR="080.console" +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="080.console" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) Modified: head/usr.sbin/bsdconfig/diskmgmt/diskmgmt ============================================================================== --- head/usr.sbin/bsdconfig/diskmgmt/diskmgmt Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/diskmgmt/diskmgmt Tue Sep 18 22:28:42 2012 (r240684) @@ -28,12 +28,12 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr -APP_DIR="050.diskmgmt" +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="050.diskmgmt" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) Modified: head/usr.sbin/bsdconfig/docsinstall/docsinstall ============================================================================== --- head/usr.sbin/bsdconfig/docsinstall/docsinstall Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/docsinstall/docsinstall Tue Sep 18 22:28:42 2012 (r240684) @@ -28,12 +28,12 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr -APP_DIR="020.docsinstall" +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="020.docsinstall" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) Modified: head/usr.sbin/bsdconfig/dot/dot ============================================================================== --- head/usr.sbin/bsdconfig/dot/dot Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/dot/dot Tue Sep 18 22:28:42 2012 (r240684) @@ -28,11 +28,11 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include_lang $BSDCFG_LIBE/include/messages.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 -APP_DIR="dot" +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="dot" +f_include_lang $BSDCFG_LIBE/include/messages.subr f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) Modified: head/usr.sbin/bsdconfig/include/Makefile ============================================================================== --- head/usr.sbin/bsdconfig/include/Makefile Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/include/Makefile Tue Sep 18 22:28:42 2012 (r240684) @@ -3,8 +3,7 @@ NO_OBJ= FILESDIR= ${LIBEXECDIR}/bsdconfig/include -FILES= common.subr dialog.subr messages.subr mustberoot.subr \ - strings.subr sysrc.subr +FILES= messages.subr beforeinstall: mkdir -p ${DESTDIR}${FILESDIR} Modified: head/usr.sbin/bsdconfig/mouse/disable ============================================================================== --- head/usr.sbin/bsdconfig/mouse/disable Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/mouse/disable Tue Sep 18 22:28:42 2012 (r240684) @@ -28,13 +28,13 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr -f_include $BSDCFG_LIBE/include/sysrc.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr +f_include $BSDCFG_SHARE/sysrc.subr -APP_DIR="110.mouse" +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="110.mouse" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) Modified: head/usr.sbin/bsdconfig/mouse/enable ============================================================================== --- head/usr.sbin/bsdconfig/mouse/enable Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/mouse/enable Tue Sep 18 22:28:42 2012 (r240684) @@ -28,13 +28,13 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr -f_include $BSDCFG_LIBE/include/sysrc.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr +f_include $BSDCFG_SHARE/sysrc.subr -APP_DIR="110.mouse" +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="110.mouse" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) Modified: head/usr.sbin/bsdconfig/mouse/flags ============================================================================== --- head/usr.sbin/bsdconfig/mouse/flags Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/mouse/flags Tue Sep 18 22:28:42 2012 (r240684) @@ -28,13 +28,13 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr -f_include $BSDCFG_LIBE/include/sysrc.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr +f_include $BSDCFG_SHARE/sysrc.subr -APP_DIR="110.mouse" +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="110.mouse" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) Modified: head/usr.sbin/bsdconfig/mouse/mouse ============================================================================== --- head/usr.sbin/bsdconfig/mouse/mouse Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/mouse/mouse Tue Sep 18 22:28:42 2012 (r240684) @@ -28,12 +28,12 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr -APP_DIR="110.mouse" +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="110.mouse" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) Modified: head/usr.sbin/bsdconfig/mouse/port ============================================================================== --- head/usr.sbin/bsdconfig/mouse/port Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/mouse/port Tue Sep 18 22:28:42 2012 (r240684) @@ -28,13 +28,13 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr -f_include $BSDCFG_LIBE/include/sysrc.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr +f_include $BSDCFG_SHARE/sysrc.subr -APP_DIR="110.mouse" +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="110.mouse" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) Modified: head/usr.sbin/bsdconfig/mouse/type ============================================================================== --- head/usr.sbin/bsdconfig/mouse/type Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/mouse/type Tue Sep 18 22:28:42 2012 (r240684) @@ -28,13 +28,13 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr -f_include $BSDCFG_LIBE/include/sysrc.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr +f_include $BSDCFG_SHARE/sysrc.subr -APP_DIR="110.mouse" +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="110.mouse" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) Modified: head/usr.sbin/bsdconfig/networking/Makefile ============================================================================== --- head/usr.sbin/bsdconfig/networking/Makefile Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/networking/Makefile Tue Sep 18 22:28:42 2012 (r240684) @@ -2,7 +2,7 @@ NO_OBJ= -SUBDIR= include +SUBDIR= include share FILESDIR= ${LIBEXECDIR}/bsdconfig/120.networking FILES= INDEX USAGE Modified: head/usr.sbin/bsdconfig/networking/defaultrouter ============================================================================== --- head/usr.sbin/bsdconfig/networking/defaultrouter Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/networking/defaultrouter Tue Sep 18 22:28:42 2012 (r240684) @@ -28,13 +28,13 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr +f_include $BSDCFG_SHARE/networking/routing.subr -APP_DIR="120.networking" -f_include $BSDCFG_LIBE/$APP_DIR/include/routing.subr +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) Modified: head/usr.sbin/bsdconfig/networking/devices ============================================================================== --- head/usr.sbin/bsdconfig/networking/devices Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/networking/devices Tue Sep 18 22:28:42 2012 (r240684) @@ -28,17 +28,17 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr -f_include $BSDCFG_LIBE/include/sysrc.subr - -APP_DIR="120.networking" -f_include $BSDCFG_LIBE/$APP_DIR/include/device.subr -f_include $BSDCFG_LIBE/$APP_DIR/include/ipaddr.subr -f_include $BSDCFG_LIBE/$APP_DIR/include/media.subr -f_include $BSDCFG_LIBE/$APP_DIR/include/netmask.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr +f_include $BSDCFG_SHARE/sysrc.subr +f_include $BSDCFG_SHARE/networking/device.subr +f_include $BSDCFG_SHARE/networking/ipaddr.subr +f_include $BSDCFG_SHARE/networking/media.subr +f_include $BSDCFG_SHARE/networking/netmask.subr + +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) Modified: head/usr.sbin/bsdconfig/networking/hostname ============================================================================== --- head/usr.sbin/bsdconfig/networking/hostname Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/networking/hostname Tue Sep 18 22:28:42 2012 (r240684) @@ -28,13 +28,13 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr +f_include $BSDCFG_SHARE/networking/hostname.subr -APP_DIR="120.networking" -f_include $BSDCFG_LIBE/$APP_DIR/include/hostname.subr +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) Modified: head/usr.sbin/bsdconfig/networking/include/Makefile ============================================================================== --- head/usr.sbin/bsdconfig/networking/include/Makefile Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/networking/include/Makefile Tue Sep 18 22:28:42 2012 (r240684) @@ -3,8 +3,7 @@ NO_OBJ= FILESDIR= ${LIBEXECDIR}/bsdconfig/120.networking/include -FILES= common.subr device.subr hostname.subr ipaddr.subr media.subr \ - messages.subr netmask.subr resolv.subr routing.subr +FILES= messages.subr beforeinstall: mkdir -p ${DESTDIR}${FILESDIR} Modified: head/usr.sbin/bsdconfig/networking/nameservers ============================================================================== --- head/usr.sbin/bsdconfig/networking/nameservers Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/networking/nameservers Tue Sep 18 22:28:42 2012 (r240684) @@ -28,13 +28,13 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr +f_include $BSDCFG_SHARE/networking/resolv.subr -APP_DIR="120.networking" -f_include $BSDCFG_LIBE/$APP_DIR/include/resolv.subr +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) Modified: head/usr.sbin/bsdconfig/networking/networking ============================================================================== --- head/usr.sbin/bsdconfig/networking/networking Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/networking/networking Tue Sep 18 22:28:42 2012 (r240684) @@ -28,12 +28,12 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr -APP_DIR="120.networking" +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) @@ -122,7 +122,7 @@ while :; do # Make subsequent uses of this menu faster by not performing # "ifconfig up" (limiting the pain one must endure). See also - # `$BSDCFG_LIBE/$APP_DIR/include/device.subr'. + # `$BSDCFG_SHARE/networking/device.subr'. # export DIALOG_MENU_NETDEV_KICK_INTERFACES= ;; Added: head/usr.sbin/bsdconfig/networking/share/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/bsdconfig/networking/share/Makefile Tue Sep 18 22:28:42 2012 (r240684) @@ -0,0 +1,12 @@ +# $FreeBSD$ + +NO_OBJ= + +FILESDIR= ${SHAREDIR}/bsdconfig/networking +FILES= common.subr device.subr hostname.subr ipaddr.subr media.subr \ + netmask.subr resolv.subr routing.subr + +beforeinstall: + mkdir -p ${DESTDIR}${FILESDIR} + +.include <bsd.prog.mk> Copied and modified: head/usr.sbin/bsdconfig/networking/share/common.subr (from r239358, head/usr.sbin/bsdconfig/networking/include/common.subr) ============================================================================== --- head/usr.sbin/bsdconfig/networking/include/common.subr Fri Aug 17 16:27:11 2012 (r239358, copy source) +++ head/usr.sbin/bsdconfig/networking/share/common.subr Tue Sep 18 22:28:42 2012 (r240684) @@ -28,8 +28,8 @@ if [ ! "$_NETWORKING_COMMON_SUBR" ]; the # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 ############################################################ FUNCTIONS Copied and modified: head/usr.sbin/bsdconfig/networking/share/device.subr (from r239358, head/usr.sbin/bsdconfig/networking/include/device.subr) ============================================================================== --- head/usr.sbin/bsdconfig/networking/include/device.subr Fri Aug 17 16:27:11 2012 (r239358, copy source) +++ head/usr.sbin/bsdconfig/networking/share/device.subr Tue Sep 18 22:28:42 2012 (r240684) @@ -28,18 +28,18 @@ if [ ! "$_NETWORKING_DEVICE_SUBR" ]; the # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/sysrc.subr - -APP_DIR="120.networking" -f_include $BSDCFG_LIBE/$APP_DIR/include/common.subr -f_include $BSDCFG_LIBE/$APP_DIR/include/ipaddr.subr -f_include $BSDCFG_LIBE/$APP_DIR/include/media.subr -f_include $BSDCFG_LIBE/$APP_DIR/include/netmask.subr -f_include $BSDCFG_LIBE/$APP_DIR/include/resolv.subr -f_include $BSDCFG_LIBE/$APP_DIR/include/routing.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/sysrc.subr +f_include $BSDCFG_SHARE/networking/common.subr +f_include $BSDCFG_SHARE/networking/ipaddr.subr +f_include $BSDCFG_SHARE/networking/media.subr +f_include $BSDCFG_SHARE/networking/netmask.subr +f_include $BSDCFG_SHARE/networking/resolv.subr +f_include $BSDCFG_SHARE/networking/routing.subr + +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ############################################################ GLOBALS Copied and modified: head/usr.sbin/bsdconfig/networking/share/hostname.subr (from r239358, head/usr.sbin/bsdconfig/networking/include/hostname.subr) ============================================================================== --- head/usr.sbin/bsdconfig/networking/include/hostname.subr Fri Aug 17 16:27:11 2012 (r239358, copy source) +++ head/usr.sbin/bsdconfig/networking/share/hostname.subr Tue Sep 18 22:28:42 2012 (r240684) @@ -28,14 +28,14 @@ if [ ! "$_NETWORKING_HOSTNAME_SUBR" ]; t # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/sysrc.subr -f_include $BSDCFG_LIBE/include/dialog.subr - -APP_DIR="120.networking" -f_include $BSDCFG_LIBE/$APP_DIR/include/common.subr -f_include $BSDCFG_LIBE/$APP_DIR/include/resolv.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/sysrc.subr +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/networking/common.subr +f_include $BSDCFG_SHARE/networking/resolv.subr + +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ############################################################ FUNCTIONS Copied and modified: head/usr.sbin/bsdconfig/networking/share/ipaddr.subr (from r239358, head/usr.sbin/bsdconfig/networking/include/ipaddr.subr) ============================================================================== --- head/usr.sbin/bsdconfig/networking/include/ipaddr.subr Fri Aug 17 16:27:11 2012 (r239358, copy source) +++ head/usr.sbin/bsdconfig/networking/share/ipaddr.subr Tue Sep 18 22:28:42 2012 (r240684) @@ -28,14 +28,14 @@ if [ ! "$_NETWORKING_IPADDR_SUBR" ]; the # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/sysrc.subr -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/strings.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/sysrc.subr +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/strings.subr +f_include $BSDCFG_SHARE/networking/common.subr -APP_DIR="120.networking" -f_include $BSDCFG_LIBE/$APP_DIR/include/common.subr +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ############################################################ FUNCTIONS Copied and modified: head/usr.sbin/bsdconfig/networking/share/media.subr (from r240679, head/usr.sbin/bsdconfig/networking/include/media.subr) ============================================================================== --- head/usr.sbin/bsdconfig/networking/include/media.subr Tue Sep 18 21:36:24 2012 (r240679, copy source) +++ head/usr.sbin/bsdconfig/networking/share/media.subr Tue Sep 18 22:28:42 2012 (r240684) @@ -28,14 +28,14 @@ if [ ! "$_NETWORKING_MEDIA_SUBR" ]; then # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/strings.subr -f_include $BSDCFG_LIBE/include/sysrc.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/strings.subr +f_include $BSDCFG_SHARE/sysrc.subr +f_include $BSDCFG_SHARE/networking/common.subr -APP_DIR="120.networking" -f_include $BSDCFG_LIBE/$APP_DIR/include/common.subr +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ############################################################ FUNCTIONS Copied and modified: head/usr.sbin/bsdconfig/networking/share/netmask.subr (from r239358, head/usr.sbin/bsdconfig/networking/include/netmask.subr) ============================================================================== --- head/usr.sbin/bsdconfig/networking/include/netmask.subr Fri Aug 17 16:27:11 2012 (r239358, copy source) +++ head/usr.sbin/bsdconfig/networking/share/netmask.subr Tue Sep 18 22:28:42 2012 (r240684) @@ -28,13 +28,13 @@ if [ ! "$_NETWORKING_NETMASK_SUBR" ]; th # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/strings.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/strings.subr +f_include $BSDCFG_SHARE/networking/common.subr -APP_DIR="120.networking" -f_include $BSDCFG_LIBE/$APP_DIR/include/common.subr +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ############################################################ FUNCTIONS Copied and modified: head/usr.sbin/bsdconfig/networking/share/resolv.subr (from r239358, head/usr.sbin/bsdconfig/networking/include/resolv.subr) ============================================================================== --- head/usr.sbin/bsdconfig/networking/include/resolv.subr Fri Aug 17 16:27:11 2012 (r239358, copy source) +++ head/usr.sbin/bsdconfig/networking/share/resolv.subr Tue Sep 18 22:28:42 2012 (r240684) @@ -28,14 +28,14 @@ if [ ! "$_NETWORKING_RESOLV_SUBR" ]; the # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/strings.subr - -APP_DIR="120.networking" -f_include $BSDCFG_LIBE/$APP_DIR/include/common.subr -f_include $BSDCFG_LIBE/$APP_DIR/include/ipaddr.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/strings.subr +f_include $BSDCFG_SHARE/networking/common.subr +f_include $BSDCFG_SHARE/networking/ipaddr.subr + +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ############################################################ CONFIGURATION Copied and modified: head/usr.sbin/bsdconfig/networking/share/routing.subr (from r239358, head/usr.sbin/bsdconfig/networking/include/routing.subr) ============================================================================== --- head/usr.sbin/bsdconfig/networking/include/routing.subr Fri Aug 17 16:27:11 2012 (r239358, copy source) +++ head/usr.sbin/bsdconfig/networking/share/routing.subr Tue Sep 18 22:28:42 2012 (r240684) @@ -28,14 +28,14 @@ if [ ! "$_NETWORKING_ROUTING_SUBR" ]; th # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/sysrc.subr -f_include $BSDCFG_LIBE/include/dialog.subr - -APP_DIR="120.networking" -f_include $BSDCFG_LIBE/$APP_DIR/include/common.subr -f_include $BSDCFG_LIBE/$APP_DIR/include/ipaddr.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/sysrc.subr +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/networking/common.subr +f_include $BSDCFG_SHARE/networking/ipaddr.subr + +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ############################################################ FUNCTIONS Modified: head/usr.sbin/bsdconfig/password/Makefile ============================================================================== --- head/usr.sbin/bsdconfig/password/Makefile Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/password/Makefile Tue Sep 18 22:28:42 2012 (r240684) @@ -2,7 +2,7 @@ NO_OBJ= -SUBDIR= include +SUBDIR= include share FILESDIR= ${LIBEXECDIR}/bsdconfig/040.password FILES= INDEX USAGE Modified: head/usr.sbin/bsdconfig/password/include/Makefile ============================================================================== --- head/usr.sbin/bsdconfig/password/include/Makefile Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/password/include/Makefile Tue Sep 18 22:28:42 2012 (r240684) @@ -3,7 +3,7 @@ NO_OBJ= FILESDIR= ${LIBEXECDIR}/bsdconfig/040.password/include -FILES= messages.subr password.subr +FILES= messages.subr beforeinstall: mkdir -p ${DESTDIR}${FILESDIR} Modified: head/usr.sbin/bsdconfig/password/password ============================================================================== --- head/usr.sbin/bsdconfig/password/password Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/password/password Tue Sep 18 22:28:42 2012 (r240684) @@ -28,13 +28,13 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr +f_include $BSDCFG_SHARE/password/password.subr -APP_DIR="040.password" -f_include $BSDCFG_LIBE/$APP_DIR/include/password.subr +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="040.password" ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) [ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm" Added: head/usr.sbin/bsdconfig/password/share/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/bsdconfig/password/share/Makefile Tue Sep 18 22:28:42 2012 (r240684) @@ -0,0 +1,11 @@ +# $FreeBSD$ + +NO_OBJ= + +FILESDIR= ${SHAREDIR}/bsdconfig/password +FILES= password.subr + +beforeinstall: + mkdir -p ${DESTDIR}${FILESDIR} + +.include <bsd.prog.mk> Copied and modified: head/usr.sbin/bsdconfig/password/share/password.subr (from r239358, head/usr.sbin/bsdconfig/password/include/password.subr) ============================================================================== --- head/usr.sbin/bsdconfig/password/include/password.subr Fri Aug 17 16:27:11 2012 (r239358, copy source) +++ head/usr.sbin/bsdconfig/password/share/password.subr Tue Sep 18 22:28:42 2012 (r240684) @@ -28,11 +28,11 @@ if [ ! "$_PASSWORD_PASSWORD_SUBR" ]; the # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr -APP_DIR="040.password" +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="040.password" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ############################################################ FUNCTIONS Modified: head/usr.sbin/bsdconfig/security/kern_securelevel ============================================================================== --- head/usr.sbin/bsdconfig/security/kern_securelevel Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/security/kern_securelevel Tue Sep 18 22:28:42 2012 (r240684) @@ -28,13 +28,13 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr -f_include $BSDCFG_LIBE/include/sysrc.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr +f_include $BSDCFG_SHARE/sysrc.subr -APP_DIR="130.security" +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="130.security" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) Modified: head/usr.sbin/bsdconfig/security/security ============================================================================== --- head/usr.sbin/bsdconfig/security/security Tue Sep 18 22:25:49 2012 (r240683) +++ head/usr.sbin/bsdconfig/security/security Tue Sep 18 22:28:42 2012 (r240684) @@ -28,13 +28,13 @@ # ############################################################ INCLUDES -BSDCFG_LIBE="/usr/libexec/bsdconfig" -. $BSDCFG_LIBE/include/common.subr || exit 1 -f_include $BSDCFG_LIBE/include/dialog.subr -f_include $BSDCFG_LIBE/include/mustberoot.subr -f_include $BSDCFG_LIBE/include/sysrc.subr +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 +f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/mustberoot.subr +f_include $BSDCFG_SHARE/sysrc.subr -APP_DIR="130.security" +BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="130.security" f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) Added: head/usr.sbin/bsdconfig/share/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/bsdconfig/share/Makefile Tue Sep 18 22:28:42 2012 (r240684) @@ -0,0 +1,11 @@ +# $FreeBSD$ + +NO_OBJ= + +FILESDIR= ${SHAREDIR}/bsdconfig +FILES= common.subr dialog.subr mustberoot.subr strings.subr sysrc.subr + +beforeinstall: + mkdir -p ${DESTDIR}${FILESDIR} + +.include <bsd.prog.mk> Copied: head/usr.sbin/bsdconfig/share/common.subr (from r239358, head/usr.sbin/bsdconfig/include/common.subr) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/bsdconfig/share/common.subr Tue Sep 18 22:28:42 2012 (r240684, copy of r239358, head/usr.sbin/bsdconfig/include/common.subr) @@ -0,0 +1,299 @@ +if [ ! "$_COMMON_SUBR" ]; then _COMMON_SUBR=1 +# +# Copyright (c) 2012 Ron McDowell +# Copyright (c) 2012 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 (INCLUDING, 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$ +# +############################################################ GLOBALS + +# +# Program name +# +pgm="${0##*/}" + +# +# Program arguments +# +ARGC="$#" +ARGV="$@" + +# +# Global exit status variables +# +SUCCESS=0 +FAILURE=1 + +############################################################ FUNCTIONS + +# +# This is an empty function by default, to use it, copy +# /usr/share/examples/bsdconfig/bsdconfigrc to $HOME/.bsdconfigrc +# +f_dprintf() +{ + : this page intentionally left blank +} + +# f_err $fmt [ $opts ... ] +# +# Print a message to stderr (fd=2). +# +f_err() +{ + printf "$@" >&2 +} + +# f_quietly $command [ $arguments ... ] +# +# run a command quietly (quell any output to stdout or stderr) +# +f_quietly() +{ + "$@" > /dev/null 2>&1 +} + +# f_have $anything ... +# +# A wrapper to the `type' built-in. Returns true if argument is a valid shell +# built-in, keyword, or externally-tracked binary, otherwise false. +# +f_have() +{ + f_quietly type "$@" +} + +# f_die [ $status [ $fmt [ $opts ... ]]] +# +# Abruptly terminate due to an error optionally displaying a message in a +# dialog box using printf(1) syntax. +# +f_die() +{ + local status=$FAILURE + + # If there is at least one argument, take it as the status + if [ $# -gt 0 ]; then + status=$1 + shift 1 # status + fi + + # If there are still arguments left, pass them to f_show_msg + [ $# -gt 0 ] && f_show_msg "$@" + + # Optionally call f_clean_up() function if it exists + f_have f_clean_up && f_clean_up + + exit $status +} + +# f_interrupt +# +# Interrupt handler. +# +f_interrupt() +{ + exec 2>&1 # fix sh(1) bug where stderr gets lost within async-trap + f_die +} + +# f_show_msg $fmt [ $opts ... ] +# +# Display a message in a dialog box using printf(1) syntax. +# +f_show_msg() *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209182228.q8IMShup073845>