diff options
author | dteske <dteske@FreeBSD.org> | 2012-10-26 02:45:29 +0000 |
---|---|---|
committer | dteske <dteske@FreeBSD.org> | 2012-10-26 02:45:29 +0000 |
commit | 48d14074adc594e953b69ea14fe21962d055c9a4 (patch) | |
tree | e8ce48b4b1af2fc56d7b69b667891fcdcdbcb80b /usr.sbin | |
parent | 3dbd508854c896164a003a274bed905f78ab9968 (diff) | |
download | FreeBSD-src-48d14074adc594e953b69ea14fe21962d055c9a4.zip FreeBSD-src-48d14074adc594e953b69ea14fe21962d055c9a4.tar.gz |
Resurrect and integrate stable/9/sysinstall/help/tcp.hlp
Approved by: adrian (co-mentor) (implicit)
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/bsdconfig/networking/include/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/bsdconfig/networking/include/tcp.hlp | 33 | ||||
-rw-r--r-- | usr.sbin/bsdconfig/networking/share/device.subr | 14 |
3 files changed, 46 insertions, 3 deletions
diff --git a/usr.sbin/bsdconfig/networking/include/Makefile b/usr.sbin/bsdconfig/networking/include/Makefile index c93d486..be6cacb 100644 --- a/usr.sbin/bsdconfig/networking/include/Makefile +++ b/usr.sbin/bsdconfig/networking/include/Makefile @@ -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} diff --git a/usr.sbin/bsdconfig/networking/include/tcp.hlp b/usr.sbin/bsdconfig/networking/include/tcp.hlp new file mode 100644 index 0000000..6d0ba10 --- /dev/null +++ b/usr.sbin/bsdconfig/networking/include/tcp.hlp @@ -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. diff --git a/usr.sbin/bsdconfig/networking/share/device.subr b/usr.sbin/bsdconfig/networking/share/device.subr index 17c7467..a002b6f 100644 --- a/usr.sbin/bsdconfig/networking/share/device.subr +++ b/usr.sbin/bsdconfig/networking/share/device.subr @@ -42,6 +42,8 @@ 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 +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 |