Author: dteske
Date: Tue Jun 18 09:43:10 2013
New Revision: 251928
URL: http://svnweb.freebsd.org/changeset/base/251928
Log:
Perform some code consolidation and add some additional error
checking/reporting. (similar to SVN revision 251919)
Modified:
head/usr.sbin/bsdconfig/networking/include/messages.subr
head/usr.sbin/bsdconfig/networking/networking
Modified: head/usr.sbin/bsdconfig/networking/include/messages.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/include/messages.subr Tue Jun 18
09:42:43 2013 (r251927)
+++ head/usr.sbin/bsdconfig/networking/include/messages.subr Tue Jun 18
09:43:10 2013 (r251928)
@@ -99,6 +99,7 @@ msg_saving_network_interface="Saving %s
msg_scanning_for_dhcp="Scanning for DHCP servers on %s interface..."
msg_select_network_interface="Select a network interface to configure.\n\n*
Interface is marked as \"active\""
msg_supported_media_options="Below is a list of supported media options for
the %s interface. Please select the options that you would like to set for the
%s network interface"
+msg_unknown_networking_menu_selection="Unknown networking menu selection"
xmsg_please_enter_fqhn="Please enter your fully qualified hostname (e.g.
foo.bar.com).\n The domain portion of the hostname will be configured in
resolv.conf(5)."
xmsg_please_enter_nameserver_existing="Please enter the new IP address of the
DNS nameserver\n(set to the NULL string to remove entry):"
xmsg_supported_media_options="Below is a list of supported media options for
the %s interface. Please\nselect the options that you would like to set for the
%s network interface"
Modified: head/usr.sbin/bsdconfig/networking/networking
==============================================================================
--- head/usr.sbin/bsdconfig/networking/networking Tue Jun 18 09:42:43
2013 (r251927)
+++ head/usr.sbin/bsdconfig/networking/networking Tue Jun 18 09:43:10
2013 (r251928)
@@ -119,35 +119,29 @@ while :; do
dialog_menu_main || f_die
f_dialog_menutag_fetch mtag
+ command=
case "$mtag" in
- X) # Exit
- break
- ;;
-
- 1) # Hostname/Domain
- $BSDCFG_LIBE/$APP_DIR/hostname ${USE_XDIALOG:+-X}
- ;;
-
- 2) # Network Interfaces
- $BSDCFG_LIBE/$APP_DIR/devices ${USE_XDIALOG:+-X}
-
- # Make subsequent uses of this menu faster by not performing
- # "ifconfig up" (limiting the pain one must endure). See also
- # `$BSDCFG_SHARE/networking/device.subr'.
- #
- export DIALOG_MENU_NETDEV_KICK_INTERFACES=
- ;;
-
- 3) # Default Router/Gateway
- $BSDCFG_LIBE/$APP_DIR/defaultrouter ${USE_XDIALOG:+-X}
- ;;
-
- 4) # DNS nameservers
- $BSDCFG_LIBE/$APP_DIR/nameservers ${USE_XDIALOG:+-X}
- ;;
-
+ X) break ;;
+ 1) command=hostname ;; # Hostname/Domain
+ 2) command=devices ;; # Network Interfaces
+ 3) command=defaultrouter ;; # Default Router/Gateway
+ 4) command=nameservers ;; # DNS nameservers
esac
+ if [ "$command" ]; then
+ $BSDCFG_LIBE/$APP_DIR/$command ${USE_XDIALOG:+-X}
+ else
+ f_die 1 "$msg_unknown_networking_menu_selection"
+ fi
+
+ if [ "$mtag" = "devices" ]; then
+ #
+ # Make subsequent uses of this menu faster by not performing
+ # "ifconfig up" (limiting the pain one must endure). See also
+ # `$BSDCFG_SHARE/networking/device.subr'.
+ #
+ export DIALOG_MENU_NETDEV_KICK_INTERFACES=
+ fi
done
exit $SUCCESS
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
