Author: dteske
Date: Fri Oct 26 02:45:29 2012
New Revision: 242117
URL: http://svn.freebsd.org/changeset/base/242117
Log:
Resurrect and integrate stable/9/sysinstall/help/tcp.hlp
Approved by: adrian (co-mentor) (implicit)
Added:
head/usr.sbin/bsdconfig/networking/include/tcp.hlp (contents, props changed)
Modified:
head/usr.sbin/bsdconfig/networking/include/Makefile
head/usr.sbin/bsdconfig/networking/share/device.subr
Modified: head/usr.sbin/bsdconfig/networking/include/Makefile
==============================================================================
--- head/usr.sbin/bsdconfig/networking/include/Makefile Fri Oct 26 02:09:55
2012 (r242116)
+++ head/usr.sbin/bsdconfig/networking/include/Makefile Fri Oct 26 02:45:29
2012 (r242117)
@@ -3,7 +3,7 @@
NO_OBJ=
FILESDIR= ${LIBEXECDIR}/bsdconfig/120.networking/include
-FILES= messages.subr
+FILES= messages.subr tcp.hlp
beforeinstall:
mkdir -p ${DESTDIR}${FILESDIR}
Added: head/usr.sbin/bsdconfig/networking/include/tcp.hlp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/bsdconfig/networking/include/tcp.hlp Fri Oct 26 02:45:29
2012 (r242117)
@@ -0,0 +1,33 @@
+This screen allows you to set up your general network parameters
+(hostname, domain name, DNS server, etc) as well as the settings for a
+given interface (which was selected from the menu before this screen).
+
+PLIP/SLIP users - please read through to the end of this doc!
+
+The "options" field is kind of special (read: a hack :-):
+
+Any valid options to ifconfig can be specified here, so if you need
+to do something "special" to get your interface working, then here
+is the place to do it.
+
+If you're running SLIP or PLIP, you also need to use it for specifying
+the remote end of the link (simply type the foreign IP address in).
+In the specific case where you're running PLIP with a Linux host peer
+rather than a FreeBSD one, you also must add the "-link0" flag after the
+foreign address.
+
+If you're dealing with an ethernet adaptor with multiple media
+connectors (e.g. AUI, 10BT, 10B2, etc), you can use this field to
+specify which one to use. Examples of valid strings include:
+
+ "media 10base5/AUI" - Select the AUI port.
+ "media 10baseT/UTP" - Select the twisted pair port.
+ "media 10base2/BNC" - Select the BNC connector.
+ "media 100baseTX" - Select 100BaseT on a 100/10 dual adaptor.
+
+If you have a wireless interface and must specify arguments such as a
+WEP key here, you may use something like:
+
+ "wepmode on wepkey 0xFEEDFACE"
+
+When you're done with this form, select OK.
Modified: head/usr.sbin/bsdconfig/networking/share/device.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/device.subr Fri Oct 26
02:09:55 2012 (r242116)
+++ head/usr.sbin/bsdconfig/networking/share/device.subr Fri Oct 26
02:45:29 2012 (r242117)
@@ -42,6 +42,8 @@ f_include $BSDCFG_SHARE/networking/routi
BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking"
f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
+TCP_HELPFILE=$BSDCFG_LIBE/$APP_DIR/include/tcp.hlp
+
############################################################ GLOBALS
#
@@ -342,6 +344,8 @@ f_dialog_menu_netdev_edit()
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
+ --help-button \
+ ${USE_XDIALOG:+--help \"\"} \
--menu \"\$prompt\" $size \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
@@ -351,8 +355,14 @@ f_dialog_menu_netdev_edit()
setvar DIALOG_MENU_$$ "$dialog_menu"
local tag="$( f_dialog_menutag )"
- # Return if "Cancel" was chosen (-1) or ESC was pressed (255)
- [ $retval -eq $SUCCESS ] || return $retval
+ if [ $retval -eq 2 ]; then
+ # The Help button was pressed
+ f_show_help "$TCP_HELPFILE"
+ continue
+ elif [ $retval -ne $SUCCESS ]; then
+ # "Cancel" was chosen (-1) or ESC was pressed (255)
+ return $retval
+ fi
#
# Call the below ``modifier functions'' whose job it is to take
_______________________________________________
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"
