Date: Sat, 10 May 2008 18:49:22 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 141426 for review Message-ID: <200805101849.m4AInMGH063518@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=141426 Change 141426 by jb@freebsd3 on 2008/05/10 18:48:32 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#74 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml#16 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml#13 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml#12 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/security/chapter.sgml#19 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/serialcomms/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#29 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/build#1 branch .. //depot/projects/dtrace/ports/UPDATING#71 integrate .. //depot/projects/dtrace/src/UPDATING#31 integrate .. //depot/projects/dtrace/src/contrib/ncurses/FREEBSD-upgrade#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/FREEBSD-vendor#2 integrate .. //depot/projects/dtrace/src/contrib/ncurses/INSTALL#6 integrate .. //depot/projects/dtrace/src/contrib/ncurses/NEWS#7 integrate .. //depot/projects/dtrace/src/contrib/ncurses/aclocal.m4#6 integrate .. //depot/projects/dtrace/src/contrib/ncurses/config.guess#6 integrate .. //depot/projects/dtrace/src/contrib/ncurses/config.sub#6 integrate .. //depot/projects/dtrace/src/contrib/ncurses/configure#6 integrate .. //depot/projects/dtrace/src/contrib/ncurses/configure.in#6 integrate .. //depot/projects/dtrace/src/contrib/ncurses/dist.mk#7 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/curses.h.in#7 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_threads.3x#2 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/terminfo.tail#6 integrate .. //depot/projects/dtrace/src/contrib/ncurses/misc/terminfo.src#7 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_addch.c#6 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_bkgd.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_delwin.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_freeall.c#6 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_getch.c#7 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_initscr.c#6 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_newterm.c#7 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_newwin.c#7 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_overlay.c#6 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_restart.c#6 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_set_term.c#7 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_ungetch.c#6 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_window.c#6 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/resizeterm.c#7 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/use_window.c#3 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/wresize.c#6 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/curses.priv.h#7 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/fifo_defs.h#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/init_keytry.c#6 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_data.c#7 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_napms.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_options.c#6 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_setup.c#7 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#6 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/use_screen.c#2 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/lib_trace.c#6 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/lib_tstp.c#6 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/lib_twait.c#6 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/tty_update.c#6 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/dump_entry.c#6 integrate .. //depot/projects/dtrace/src/contrib/pf/pfctl/parse.y#5 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#9 integrate .. //depot/projects/dtrace/src/include/readpassphrase.h#4 integrate .. //depot/projects/dtrace/src/kerberos5/usr.bin/krb5-config/Makefile#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/Makefile.inc#11 integrate .. //depot/projects/dtrace/src/lib/libc/sys/Symbol.map#11 integrate .. //depot/projects/dtrace/src/lib/libc/sys/getsockopt.2#8 integrate .. //depot/projects/dtrace/src/lib/libc/sys/setfib.2#1 branch .. //depot/projects/dtrace/src/lib/libftpio/ftpio.c#6 integrate .. //depot/projects/dtrace/src/lib/ncurses/ncurses/ncurses_cfg.h#5 integrate .. //depot/projects/dtrace/src/sbin/ipfw/ipfw.8#20 integrate .. //depot/projects/dtrace/src/sbin/ipfw/ipfw2.c#19 integrate .. //depot/projects/dtrace/src/share/man/man4/malo.4#3 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#42 integrate .. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#30 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#50 integrate .. //depot/projects/dtrace/src/sys/conf/options#50 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#10 integrate .. //depot/projects/dtrace/src/sys/contrib/pf/net/pf.c#15 integrate .. //depot/projects/dtrace/src/sys/contrib/pf/net/pf_ioctl.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/firewire/firewire.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/firewire/fwohci.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_pci.c#19 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uipaq.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#34 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#38 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/pmap.c#16 integrate .. //depot/projects/dtrace/src/sys/kern/init_sysent.c#33 integrate .. //depot/projects/dtrace/src/sys/kern/kern_event.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/kern_lockf.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/subr_param.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/sys_socket.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.c#32 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.master#24 integrate .. //depot/projects/dtrace/src/sys/kern/systrace_args.c#28 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_socket.c#25 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_export.c#8 integrate .. //depot/projects/dtrace/src/sys/mips/mips/pmap.c#3 integrate .. //depot/projects/dtrace/src/sys/net/bpf.c#22 integrate .. //depot/projects/dtrace/src/sys/net/if.c#16 integrate .. //depot/projects/dtrace/src/sys/net/if_atmsubr.c#7 integrate .. //depot/projects/dtrace/src/sys/net/if_ethersubr.c#17 integrate .. //depot/projects/dtrace/src/sys/net/if_fwsubr.c#7 integrate .. //depot/projects/dtrace/src/sys/net/if_gif.c#11 integrate .. //depot/projects/dtrace/src/sys/net/if_gif.h#4 integrate .. //depot/projects/dtrace/src/sys/net/if_gre.c#12 integrate .. //depot/projects/dtrace/src/sys/net/if_gre.h#5 integrate .. //depot/projects/dtrace/src/sys/net/if_iso88025subr.c#7 integrate .. //depot/projects/dtrace/src/sys/net/if_loop.c#11 integrate .. //depot/projects/dtrace/src/sys/net/if_stf.c#10 integrate .. //depot/projects/dtrace/src/sys/net/if_var.h#9 integrate .. //depot/projects/dtrace/src/sys/net/radix_mpath.c#3 integrate .. //depot/projects/dtrace/src/sys/net/radix_mpath.h#2 integrate .. //depot/projects/dtrace/src/sys/net/route.c#15 integrate .. //depot/projects/dtrace/src/sys/net/route.h#8 integrate .. //depot/projects/dtrace/src/sys/net/rtsock.c#11 integrate .. //depot/projects/dtrace/src/sys/netatalk/at_extern.h#5 integrate .. //depot/projects/dtrace/src/sys/netatalk/at_proto.c#5 integrate .. //depot/projects/dtrace/src/sys/netgraph/netflow/netflow.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/if_atm.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/if_ether.c#16 integrate .. //depot/projects/dtrace/src/sys/netinet/in_gif.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/in_mcast.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet/in_pcb.c#22 integrate .. //depot/projects/dtrace/src/sys/netinet/in_pcb.h#10 integrate .. //depot/projects/dtrace/src/sys/netinet/in_rmx.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet/in_var.h#6 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fastfwd.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw.h#11 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#30 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_icmp.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_input.c#13 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_mroute.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_mroute.h#6 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_options.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_output.c#18 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_var.h#7 integrate .. //depot/projects/dtrace/src/sys/netinet/raw_ip.c#16 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_os_bsd.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_input.c#16 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_subr.c#21 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.c#19 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6.c#15 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_ifattach.c#11 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_rmx.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6_rtr.c#9 integrate .. //depot/projects/dtrace/src/sys/netipx/ipx_proto.c#5 integrate .. //depot/projects/dtrace/src/sys/nfs4client/nfs4_vfsops.c#13 integrate .. //depot/projects/dtrace/src/sys/nfsclient/bootp_subr.c#7 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#20 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/pmap_dispatch.c#11 integrate .. //depot/projects/dtrace/src/sys/sparc64/include/bus.h#6 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/bus_machdep.c#7 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/pmap.c#17 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/upa.c#4 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#27 integrate .. //depot/projects/dtrace/src/sys/sys/domain.h#5 integrate .. //depot/projects/dtrace/src/sys/sys/mbuf.h#17 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#52 integrate .. //depot/projects/dtrace/src/sys/sys/proc.h#43 integrate .. //depot/projects/dtrace/src/sys/sys/socket.h#12 integrate .. //depot/projects/dtrace/src/sys/sys/socketvar.h#10 integrate .. //depot/projects/dtrace/src/sys/sys/syscall.h#30 integrate .. //depot/projects/dtrace/src/sys/sys/syscall.mk#30 integrate .. //depot/projects/dtrace/src/sys/sys/sysproto.h#30 integrate .. //depot/projects/dtrace/src/sys/vm/pmap.h#11 integrate .. //depot/projects/dtrace/src/usr.bin/netstat/route.c#13 integrate .. //depot/projects/dtrace/src/usr.sbin/Makefile#25 integrate .. //depot/projects/dtrace/src/usr.sbin/setfib/Makefile#1 branch .. //depot/projects/dtrace/src/usr.sbin/setfib/setfib.1#1 branch .. //depot/projects/dtrace/src/usr.sbin/setfib/setfib.c#1 branch Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml#2 (text+ko) ==== @@ -28,7 +28,7 @@ <holder role="mailto:sonicy@otenet.gr">Manolis Kiagias</holder> </copyright> - <releaseinfo>$FreeBSD: doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml,v 1.2 2008/02/12 07:40:35 ale Exp $</releaseinfo> + <releaseinfo>$FreeBSD: doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml,v 1.3 2008/05/10 13:32:28 blackend Exp $</releaseinfo> <legalnotice id="trademarks" role="trademarks"> &tm-attrib.freebsd; @@ -153,7 +153,7 @@ <para>The driver will create a kernel module, which should be loaded at system startup. You will need to add the following line to the - <filename>/boot/loader.conf</filename> file: + <filename>/boot/loader.conf</filename> file:</para> <programlisting>nvidia_load="YES"</programlisting> @@ -263,9 +263,9 @@ you should be able to perform most of the above settings by entering the following commands (as root):</para> - <screen>&prompt.root; nvidia-xconfig --add-argb-glx-visuals -&prompt.root; nvidia-xconfig --composite -&prompt.root; nvidia-xconfig --depth=24</screen> + <screen>&prompt.root; <userinput>nvidia-xconfig --add-argb-glx-visuals</userinput> +&prompt.root; <userinput>nvidia-xconfig --composite</userinput> +&prompt.root; <userinput>nvidia-xconfig --depth=24</userinput></screen> <para>You may wish to run <command>nvidia-xonfig -A |more</command> to see a list of all the options offered by the above @@ -278,12 +278,12 @@ <para>Installing <application>Compiz Fusion</application> is as simple as any other port:</para> - <screen>&prompt.root; cd /usr/ports/x11-wm/compiz-fusion -&prompt.root; make install clean</screen> + <screen>&prompt.root; <userinput>cd /usr/ports/x11-wm/compiz-fusion</userinput> +&prompt.root; <userinput>make install clean</userinput></screen> <para>Make sure to select the <quote>EXTRA</quote> plugins and the <quote>EMERALD</quote> window decorator from the options dialog that - appears. If you are using <application>Gnome</application>, or + appears. If you are using <application>GNOME</application>, or already have support for <command>gconf</command> in your system, you may also wish to select <quote>gconf support</quote>. In this way, your effect settings will be integrated with the other desktop settings, @@ -297,8 +297,8 @@ <para>When the installation is finished, start your graphic desktop and at a terminal, enter the following commands (as a normal user):</para> - <screen>compiz --replace --sm-disable --ignore-desktop-hints ccp & -emerald --replace &</screen> + <screen>&prompt.user; <userinput>compiz --replace --sm-disable --ignore-desktop-hints ccp &</userinput> +&prompt.user; <userinput>emerald --replace &</userinput></screen> <para>Your screen will flicker for a few seconds, as your window manager (e.g. <application>Metacity</application> if you are using @@ -319,7 +319,7 @@ <para>Save this in your home directory as, for example, <filename>start-compiz</filename> and make it executable:</para> - <screen>chmod +x ~/start-compiz</screen> + <screen>&prompt.user; <userinput>chmod +x ~/start-compiz</userinput></screen> <para>Then use the GUI to add it to <guimenuitem>Startup Programs</guimenuitem> @@ -332,7 +332,7 @@ execute (again as a normal user) the <application>Compiz Config Settings Manager</application>:</para> - <screen>ccsm</screen> + <screen>&prompt.user; <userinput>ccsm</userinput></screen> <note> <para>In <application>GNOME</application>, this can also be found in @@ -365,8 +365,8 @@ <answer> <para>You are probably missing a setting in <filename>/etc/X11/xorg.conf</filename>. Review this file - carefully and check especially the DefaultDepth and - AddARGBGLXVisuals directives.</para> + carefully and check especially the <literal>DefaultDepth</literal> and + <literal>AddARGBGLXVisuals</literal> directives.</para> </answer> </qandaentry> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#74 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.931 2008/05/06 04:47:37 sam Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.932 2008/05/09 23:40:39 julian Exp $ --> <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ @@ -12089,6 +12089,11 @@ to multi-bss support (aka vaps).</entry> <entry>800036</entry> </row> + <row> + <entry>8.0-CURRENT after addition of multi routing + table support (a.k.a. setfib(1), setfib(2)) </entry> + <entry>800037</entry> + </row> </tbody> </tgroup> </table> ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml#16 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.283 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml,v 1.21 2008/05/05 11:29:38 loader Exp $ + Original Revision: 1.285 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml,v 1.22 2008/05/09 14:04:32 loader Exp $ --> <chapter id="disks"> @@ -214,7 +214,7 @@ <userinput>A</userinput> ，FreeBSD 将使用全部的磁盘。当被告知 <quote>remain cooperative with any future possible operating systems</quote>时，回答 <literal>YES</literal>。使用 - <userinput>W</userinput> 保存刚才的修改。现在使用 <userinput>q</userinput> + <keycap>W</keycap> 保存刚才的修改。现在使用 <keycap>Q</keycap> 退出 FDISK 编辑器。下面会看到有关 <quote>主引导区</quote> 的信息。 现在您已经在运行的系统上添加了一个磁盘， 因此应该选择 <literal>None</literal>。</para> @@ -236,7 +236,7 @@ 模式下代表整个 slice。其它分区作为一般分区来使用。</para> <para><application>sysinstall</application> 的标签编辑器用 <literal>e</literal> - 表示非 root 和非 swap 分区。在标签编辑器中，可以使用键入<userinput>C</userinput> + 表示非 root 和非 swap 分区。在标签编辑器中，可以使用键入 <keycap>C</keycap> 创建一个文件系统。当提示这是否是一个 FS（文件系统）或 swap 时，选择 <literal>FS</literal>，然后给出一个加载点（如： <filename>/mnt</filename>）。 当在 post-install 模式时添加一个磁盘， <application>sysinstall</application> @@ -244,7 +244,7 @@ </para> <para>现在已经准备把新标签写到磁盘上，然后创建一个文件系统，可以按下 - <userinput>W</userinput>。出现任何错误都会不能创建新的分区。可以退出标签编辑 + <keycap>W</keycap>。出现任何错误都会不能创建新的分区。可以退出标签编辑 器然后重新执行 <application>sysinstall</application> 。</para> </step> @@ -756,17 +756,17 @@ <para>最后一步是创建将要挂接文件系统的目录。 这个目录必须是属于将要挂接文件系统的用户的。 以 <username>root</username> 身份为用户建立属于该用户的 - <filename>/mnt/<replaceable>$USER</replaceable></filename> - (此处 <replaceable>$USER</replaceable> 应替换成用户的登录名)：</para> + <filename>/mnt/<replaceable>username</replaceable></filename> + (此处 <replaceable>username</replaceable> 应替换成用户的登录名)：</para> - <screen>&prompt.root; <userinput>mkdir /mnt/$USER</userinput> -&prompt.root; <userinput>chown <replaceable>$USER</replaceable>:<replaceable>$USER</replaceable> /mnt/<replaceable>$USER</replaceable></userinput></screen> + <screen>&prompt.root; <userinput>mkdir /mnt/<replaceable>username</replaceable></userinput> +&prompt.root; <userinput>chown <replaceable>user</replaceable>:<replaceable>user</replaceable> /mnt/<replaceable>user</replaceable></userinput></screen> <para>假设已经插入了一个 USB 读卡设备， 并且系统将其识别为 <filename>/dev/da0s1</filename>， 由于这些设备通常是 FAT 文件系统， 用户可以这样挂接它们：</para> - <screen>&prompt.user; <userinput>mount -t msdosfs -m 644 -M 755 /dev/da0s1 /mnt/<replaceable>$USER</replaceable></userinput></screen> + <screen>&prompt.user; <userinput>mount -t msdosfs -m 644 -M 755 /dev/da0s1 /mnt/<replaceable>username</replaceable></userinput></screen> <para>如果拔出设备 (必须首先将其对应的磁盘卷卸下)， 则您会在系统消息缓冲区中看到类似下面的信息：</para> ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml#13 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Chinese Documentation Project - Original Revision: 1.181 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml,v 1.17 2008/04/21 06:46:26 loader Exp $ + Original Revision: 1.183 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml,v 1.18 2008/05/09 14:04:32 loader Exp $ --> <chapter id="kernelconfig"> @@ -241,10 +241,11 @@ 目录下面， 复制 <filename>GENERIC</filename> 配置文件， 并给这个文件起一个容易辨认的名称， 它就是您的内核名称。例如：</para> <screen>&prompt.root; <userinput>cd /usr/src/sys/<replaceable>i386</replaceable>/conf</userinput> -&prompt.root; <userinput>cp GENERIC MYKERNEL</userinput></screen> +&prompt.root; <userinput>cp GENERIC <replaceable>MYKERNEL</replaceable></userinput></screen> <para>通常，这个名称是大写的，如果您正维护着多台不同硬件的&os;机器， - 以您机器的域名来命名是非常好的主意。我们把它命名为<filename>MYKERNEL</filename>就是这个原因。 + 以您机器的域名来命名是非常好的主意。我们把它命名为 + <filename><replaceable>MYKERNEL</replaceable></filename>就是这个原因。 </para> <tip> @@ -277,7 +278,8 @@ </para> </note> - <para>现在就可以用您喜欢的文本编辑器来编辑 <filename>MYKERNEL</filename> 了。 + <para>现在就可以用您喜欢的文本编辑器来编辑 + <filename><replaceable>MYKERNEL</replaceable></filename> 了。 如果您刚刚开始使用 FreeBSD， 唯一可用的编辑器很可能是 <application>vi</application>， 它的使用比较复杂， 限于篇幅， 这里不予介绍， 您可以在 <link @@ -462,7 +464,7 @@ <programlisting>ident GENERIC</programlisting> <para>这是内核的名字。 您应该取一个自己的名字， - 例如取名叫 <literal>MYKERNEL</literal>， + 例如取名叫 <literal><replaceable>MYKERNEL</replaceable></literal>， 如果您一直在按照前面的说明做的话。 您放在 <literal>ident</literal> 后面的字符串在启动内核时会显示出来， @@ -1282,7 +1284,7 @@ 否则类似 &man.ps.1; 这样的命令可能无法正常工作。 为了完成这一点， 需要修改目录的名字：</para> - <screen>&prompt.root; <userinput>mv /boot/kernel /boot/kernel.bad</userinput> + <screen>&prompt.root; <userinput>mv /boot/kernel <replaceable>/boot/kernel.bad</replaceable></userinput> &prompt.root; <userinput>mv /boot/<replaceable>kernel.good</replaceable> /boot/kernel</userinput></screen> </note> ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.sgml#9 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.177 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.sgml,v 1.11 2008/02/09 13:33:15 loader Exp $ + Original Revision: 1.179 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.sgml,v 1.12 2008/05/09 14:04:32 loader Exp $ --> <chapter id="ppp-and-slip"> @@ -233,7 +233,11 @@ <sect3> <title><application>PPP</application>自动化配置</title> - <indexterm><primary>PPP</primary><secondary>configuration</secondary></indexterm> + <indexterm> + <primary>PPP</primary> + <secondary>configuration</secondary> + </indexterm> + <para> <command>ppp</command>和<command>pppd</command>(PPP的内核级实现) 都使用<filename>/etc/ppp</filename>目录中的配置文件。 用户级 PPP 的例子可以在 <filename>/usr/share/examples/ppp/</filename> 中找到。</para> @@ -245,7 +249,11 @@ <sect4 id="userppp-staticIP"> <title>PPP和静态IP地址</title> - <indexterm><primary>PPP</primary><secondary>with static IP addresses</secondary></indexterm> + <indexterm> + <primary>PPP</primary> + <secondary>with static IP addresses</secondary> + </indexterm> + <para>您需要编辑配置文件<filename>/etc/ppp/ppp.conf</filename>， 如下所示。</para> <note> @@ -256,7 +264,7 @@ <programlisting>1 default: 2 set log Phase Chat LCP IPCP CCP tun command 3 ident user-ppp VERSION (built COMPILATIONDATE) -4 set device /dev/cuaa0 +4 set device /dev/cuad0 5 set speed 115200 6 set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \ 7 \"\" AT OK-AT-OK ATE1Q0 OK \\dATDT\\T TIMEOUT 40 CONNECT" @@ -305,8 +313,11 @@ <listitem> <para>标明modem要连接的端口号。 <devicename>COM1</devicename> 对应的设备是 - <filename>/dev/cuaa0</filename>， 而 <devicename>COM2</devicename> - 对应的则是 <filename>/dev/cuaa1</filename>。</para> + <filename>/dev/cuad0</filename>（或者 &os; 5.X 下 + <filename>/dev/cuaa0</filename>） + 而 <devicename>COM2</devicename> + 对应的则是 <filename>/dev/cuad1</filename>（或者 + <filename>/dev/cuaa1</filename>）。</para> </listitem> </varlistentry> @@ -322,7 +333,11 @@ <varlistentry> <term>行 6 & 7：</term> - <indexterm><primary>PPP</primary><secondary>user PPP</secondary></indexterm> + <indexterm> + <primary>PPP</primary> + <secondary>user PPP</secondary> + </indexterm> + <listitem> <para>拨号字符串。 用户级 PPP 使用一种与 &man.chat.8;程序相似的语法。 请参考联机手册了解这种语言的相关信息。</para> @@ -472,8 +487,16 @@ <sect4 id="userppp-dynamicIP"> <title>PPP和动态IP地址</title> - <indexterm><primary>PPP</primary><secondary>with dynamic IP addresses</secondary></indexterm> - <indexterm><primary>IPCP</primary></indexterm> + + <indexterm> + <primary>PPP</primary> + <secondary>with dynamic IP addresses</secondary> + </indexterm> + + <indexterm> + <primary>IPCP</primary> + </indexterm> + <para>如果ISP没给您指定静态的IP地址， <command>ppp</command>要被配置成能够与对方协商确定本地和远程地址。 要完成这项工作， 先要<quote>猜</quote>一个IP地址， 然后允许 <command>ppp</command>在连接后使用IP配置协议(IPCP)进行正确配置。 @@ -542,8 +565,12 @@ <sect4> <title>接收拨入</title> - <indexterm><primary>PPP</primary><secondary>receiving - incoming calls</secondary></indexterm> + + <indexterm> + <primary>PPP</primary> + <secondary>receiving incoming calls</secondary> + </indexterm> + <para>当要配置 <application>ppp</application>接受来自LAN上的 拨入时， 您需要决定是否将包转给LAN。 如果是的话， 您就必须从 LAN 子网中给对方分配一个IP， 需要在文件 <filename>/etc/ppp/ppp.conf</filename> @@ -582,7 +609,7 @@ <para><command>ppp</command> 命令通常必须以 <username>root</username> 用户的身份运行。 如果希望以普通用户的身份启动 <command>ppp</command> 服务 (就像下面描述的那样)， 就必须把此用户加入 - <username>network</username> 组， 使其获得运行 <command>ppp</command> + <groupname>network</groupname> 组， 使其获得运行 <command>ppp</command> 的权限。</para> <para>您还需要使用<command>allow</command>命令使用户能访问配置文 @@ -595,7 +622,10 @@ <sect4> <title>动态IP用户的PPP Shell</title> - <indexterm><primary>PPP shells</primary></indexterm> + + <indexterm> + <primary>PPP shells</primary> + </indexterm> <para>创建一个名为<filename>/etc/ppp/ppp-shell</filename>文件， 加入以下内容：</para> <programlisting>#!/bin/sh @@ -637,7 +667,10 @@ <sect4> <title>静态IP用户的Shell </title> - <indexterm><primary>PPP shells</primary></indexterm> + + <indexterm> + <primary>PPP shells</primary> + </indexterm> <para>像上面那样创建<filename>ppp-shell</filename>文件， 为每个静态分配IP用户创建一个到 <filename>ppp-shell</filename>的 @@ -717,11 +750,18 @@ <sect4 id="userppp-mgetty"> <title><command>mgetty</command>和AutoPPP</title> + + <indexterm> + <primary><command>mgetty</command></primary> + </indexterm> + <indexterm> - <primary><command>mgetty</command></primary> - </indexterm> - <indexterm><primary>AutoPPP</primary></indexterm> - <indexterm><primary>LCP</primary></indexterm> + <primary>AutoPPP</primary> + </indexterm> + + <indexterm> + <primary>LCP</primary> + </indexterm> <para>在配置和编译<command>mgetty</command> 时启用 <literal>AUTO_PPP</literal>选项 @@ -768,9 +808,19 @@ <sect4> <title>MS Extensions</title> - <indexterm><primary>DNS</primary></indexterm> - <indexterm><primary>NetBIOS</primary></indexterm> - <indexterm><primary>PPP</primary><secondary>Microsoft extensions</secondary></indexterm> + + <indexterm> + <primary>DNS</primary> + </indexterm> + + <indexterm> + <primary>NetBIOS</primary> + </indexterm> + + <indexterm> + <primary>PPP</primary><secondary>Microsoft extensions</secondary> + </indexterm> + <para>可以配置PPP以提供DNS和NetBIOS域名服务器地址。</para> <para>要在 PPP 1.x 版本中启用这些扩展， 需要在 @@ -873,12 +923,16 @@ <sect3 id="userppp-nat"> <title>使用PPP网络地址翻译</title> - <indexterm><primary>PPP</primary><secondary>NAT</secondary></indexterm> + + <indexterm> + <primary>PPP</primary> + <secondary>NAT</secondary> + </indexterm> <para>PPP 可以使用内建的 NAT， 而无需内核支持。 您可以在 <filename>/etc/ppp/ppp.conf</filename> 中加入如下配置来启用它：</para> - <programlisting>nat enable yes</programlisting> + <programlisting>nat enable yes</programlisting> <para> PPP NAT也可以使用命令行选项 <literal>-nat</literal>启动。 在 @@ -886,20 +940,23 @@ <literal>ppp_nat</literal> 项， 并默认启用。</para> <para>如果您使用了这个特性， 您还会发现在 -<filename>/etc/ppp/ppp.conf</filename>中以下 - 选项对于启用incoming connections forwarding是有用的：</para> + <filename>/etc/ppp/ppp.conf</filename>中以下 + 选项对于启用incoming connections forwarding是有用的：</para> - <programlisting>nat port tcp 10.0.0.2:ftp ftp + <programlisting>nat port tcp 10.0.0.2:ftp ftp nat port tcp 10.0.0.2:http http</programlisting> <para>或者完全不信任外来的请求</para> - <programlisting>nat deny_incoming yes</programlisting> + <programlisting>nat deny_incoming yes</programlisting> </sect3> <sect3 id="userppp-final"> <title>最后的系统配置</title> - <indexterm><primary>PPP</primary><secondary>configuration</secondary></indexterm> + + <indexterm> + <primary>PPP</primary><secondary>configuration</secondary> + </indexterm> <para>现在您已配置了<command>ppp</command>， 但在真正工作之前还有一些事情要做。 即修改 <filename>/etc/rc.conf</filename>。</para> @@ -931,13 +988,15 @@ </note> <para>务必在 - <filename>/etc/rc.conf</filename> 中， 把路由程序设置为 <literal>NO</literal>：</para> + <filename>/etc/rc.conf</filename> 中， + 把路由程序设置为 <literal>NO</literal>：</para> <programlisting>router_enable="NO"</programlisting> <indexterm> - <primary><application>routed</application></primary> - </indexterm> + <primary><application>routed</application></primary> + </indexterm> + <para>不启动 <command>routed</command> 服务程序非常重要， 因为 <command>routed</command> 总会删掉由 <command>ppp</command> 所建立的默认路由。</para> @@ -965,7 +1024,10 @@ 3 add 0 0 HISADDR 4 !bg sendmail -bd -q30m</programlisting> - <indexterm><primary>SMTP</primary></indexterm> + <indexterm> + <primary>SMTP</primary> + </indexterm> + <para>如果您不喜欢这样做， 可以设立一个 <quote>dfilter</quote> 以阻止 SMTP 传输。 参考相关文件了解更多细节。</para> @@ -1080,7 +1142,11 @@ <sect2> <title>设立内核级PPP</title> - <indexterm><primary>PPP</primary><secondary>kernel PPP</secondary></indexterm> + + <indexterm> + <primary>PPP</primary> + <secondary>kernel PPP</secondary> + </indexterm> <para>在开始设置内核级PPP时， 需要确信<command>pppd</command>已经被定位在<filename>/usr/sbin</filename> 中 且存在<filename>/etc/ppp</filename>目录。</para> @@ -1093,7 +1159,11 @@ 您要通过PPP串行线或modem线把您的机器连接到互联网上。</para> </listitem> - <indexterm><primary>PPP</primary><secondary>server</secondary></indexterm> + <indexterm> + <primary>PPP</primary> + <secondary>server</secondary> + </indexterm> + <listitem> <para>作为<quote>服务器</quote> —计算机已经位于网络上， 且被用于通过PPP与其它计算机连接。</para> </listitem> @@ -1120,8 +1190,16 @@ </sect2info> <title>使用<command>pppd</command>作为客户端</title> - <indexterm><primary>PPP</primary><secondary>client</secondary></indexterm> - <indexterm><primary>Cisco</primary></indexterm> + + <indexterm> + <primary>PPP</primary> + <secondary>client</secondary> + </indexterm> + + <indexterm> + <primary>Cisco</primary> + </indexterm> + <para>下面这个 <filename>/etc/ppp/options</filename>选项文件能够被用来与CISCO终端服务器的 PPP线连接。</para> @@ -1133,10 +1211,10 @@ passive # wait for LCP packets domain ppp.foo.com # put your domain name here -:<remote_ip> # put the IP of remote PPP host here +:<replaceable>remote_ip</replaceable> # put the IP of remote PPP host here # it will be used to route packets via PPP link # if you didn't specified the noipdefault option - # change this line to <local_ip>:<remote_ip> + # change this line to <replaceable>local_ip</replaceable>:<replaceable>remote_ip</replaceable> defaultroute # put this if you want that PPP server will be your # default router</programlisting> @@ -1191,7 +1269,10 @@ kermit -y /etc/ppp/kermit.dial pppd /dev/tty01 19200</programlisting> - <indexterm><primary>Kermit</primary></indexterm> + <indexterm> + <primary>Kermit</primary> + </indexterm> + <para><filename>/etc/ppp/kermit.dial</filename> 是一个 <application>Kermit</application> 脚本， 它会完成拨号， 并在远程主机上完成所有需要的身份验证过程 (这份文档的最后有一个脚本实例)。</para> @@ -1217,7 +1298,8 @@ kermit -y /etc/ppp/kermit.hup /etc/ppp/ppptest</programlisting> - <para>通过执行<filename>/usr/etc/ppp/ppptest</filename>， 看看<command>pppd</command> 是否仍在运行：</para> + <para>通过执行<filename>/usr/etc/ppp/ppptest</filename>， + 看看<command>pppd</command> 是否仍在运行：</para> <programlisting>#!/bin/sh pid=`pgrep pppd` @@ -1259,7 +1341,7 @@ <para><filename>/etc/ppp/options</filename>：</para> - <programlisting>/dev/cuaa1 115200 + <programlisting>/dev/cuad1 115200 crtscts # enable hardware flow control modem # modem control line @@ -1268,12 +1350,12 @@ # if the remote host doesn't send your IP during # IPCP negotiation, remove this option passive # wait for LCP packets -domain <your.domain> # put your domain name here +domain <replaceable>your.domain</replaceable> # put your domain name here : # put the IP of remote PPP host here # it will be used to route packets via PPP link # if you didn't specified the noipdefault option - # change this line to <local_ip>:<remote_ip> + # change this line to <replaceable>local_ip</replaceable>:<replaceable>remote_ip</replaceable> defaultroute # put this if you want that PPP server will be # your default router</programlisting> @@ -1284,9 +1366,9 @@ <para>以下的内容应该放在一行内。</para> </note> - <programlisting>ABORT BUSY ABORT 'NO CARRIER' "" AT OK ATDT<phone.number> - CONNECT "" TIMEOUT 10 ogin:-\\r-ogin: <login-id> - TIMEOUT 5 sword: <password></programlisting> + <programlisting>ABORT BUSY ABORT 'NO CARRIER' "" AT OK ATDT<replaceable>phone.number</replaceable> + CONNECT "" TIMEOUT 10 ogin:-\\r-ogin: <replaceable>login-id</replaceable> + TIMEOUT 5 sword: <replaceable>password</replaceable></programlisting> <para>一旦这些被安装且修改正确， 您所要做的就是运行<command>pppd</command>， 就像这样：</para> @@ -1519,7 +1601,10 @@ </sect1info> <title><acronym>PPP</acronym> 连接故障排除</title> - <indexterm><primary>PPP</primary><secondary>troubleshooting</secondary></indexterm> + <indexterm> + <primary>PPP</primary> + <secondary>troubleshooting</secondary> + </indexterm> <para>本节将讲述通过modem连接使用PPP时可能出现的问题。 例如， 您可能需要确切地知道您拨入的系统会出现一个怎样的命令行提示符。 @@ -1543,7 +1628,9 @@ 您就会在 <devicename>sio1</devicename> 或 <devicename>COM2</devicename> 上找到它。 如果 modem 设备连接在 <devicename>sio1</devicename> 接口 (在 DOS 中称为<devicename>COM2</devicename>)， - 那么您的 modem 将会是 <filename>/dev/cuaa1</filename>。</para> + 那么您的 modem 将会是 <filename>/dev/cuad1</filename> + （或者 &os;nbsp;5.X 下的 + <filename>/dev/cuaa1</filename>）。</para> </sect2> <sect2> @@ -1560,10 +1647,11 @@ <para>现在我们已经打开了<command>ppp</command>。</para> - <screen>ppp ON example> <userinput>set device <filename>/dev/cuaa1</filename></userinput></screen> + <screen>ppp ON example> <userinput>set device <filename>/dev/cuad1</filename></userinput></screen> <para>设置modem设备， 在本例子中是 - <devicename>cuaa1</devicename>。</para> + <devicename>cuad1</devicename> （或者 &os; 5.X 下的 + <filename>/dev/cuaa1</filename>）。</para> <screen>ppp ON example> <userinput>set speed 115200</userinput></screen> @@ -1579,7 +1667,7 @@ <para>切换到 <quote>终端</quote>样我们就能手动地控制这台 modem 的模式。</para> - <programlisting>deflink: Entering terminal mode on <filename>/dev/cuaa1</filename> + <programlisting>deflink: Entering terminal mode on <filename>/dev/cuad1</filename> type '~h' for help</programlisting> <screen><userinput>at</userinput> @@ -1733,7 +1821,12 @@ </sect1info> <title>使用基于以太网的PPP(PPPoE)</title> - <indexterm><primary>PPP</primary><secondary>over Ethernet</secondary></indexterm> + + <indexterm> + <primary>PPP</primary> + <secondary>over Ethernet</secondary> + </indexterm> + <indexterm> <primary>PPPoE</primary> <see>PPP, over Ethernet (以太网上的 PPP)</see> @@ -1840,10 +1933,12 @@ <sect2 id="ppp-3com"> - <title>带有一个&tm.3com; <trademark class="registered">HomeConnect</trademark>ADSL Modem的PPPOE双重连接</title> + <title>带有一个&tm.3com; + <trademark class="registered">HomeConnect</trademark> + ADSL Modem的PPPOE双重连接</title> <para>这个 modem 不遵循 <ulink - url="http://www.faqs.org/rfcs/rfc2516.html">RFC 2516</ulink> + url="http://www.faqs.org/rfcs/rfc2516.html">RFC 2516</ulink> (<emphasis>A Method for transmitting PPP over Ethernet (PPPoE)</emphasis>， 其作者为 L. Mamakos、 K. Lidl、 J. Evarts、 D. Carrel、 D. Simone 以及 R. Wheeler)。 @@ -1870,7 +1965,12 @@ <sect1 id="pppoa"> <title>使用 ATM 上的 <application>PPP</application> (PPPoA)</title> - <indexterm><primary>PPP</primary><secondary>over ATM</secondary></indexterm> + + <indexterm> + <primary>PPP</primary> + <secondary>over ATM</secondary> + </indexterm> + <indexterm> <primary>PPPoA</primary> <see>基于ATM的PPP</see> @@ -2123,17 +2223,17 @@ <para>首先， 您需要确认调制解调器所连接的串口。 许多人会设置一个符号连接， 例如 <filename>/dev/modem</filename>， 用以指向实际的设备名， - <filename>/dev/cuaaN</filename> (或在 &os; 6.X 下是 - <filename>/dev/cuadN</filename>)。 这样您就可以对实际的设备名进行抽象， + <filename>/dev/cuadN</filename> (或在 &os; 5.X 下是 + <filename>/dev/cuaaN</filename>)。 这样您就可以对实际的设备名进行抽象， 以备调制解调器换到其他串口时方便调整之用。 不然， 在系统中修改一大堆 <filename>/etc</filename> 下的文件以及 <filename>.kermrc</filename> 将是非常麻烦的事情！</para> <note> - <para><filename>/dev/cuaa0</filename> (或 &os; 6.X - 中的 <filename>/dev/cuad0</filename>) 对应 - <devicename>COM1</devicename>， 而 <filename>cuaa1</filename> - (或 <filename>/dev/cuad1</filename>) 则对应 + <para><filename>/dev/cuad0</filename> (或 &os; 5.X + 下的 <filename>/dev/cuaa0</filename>) 对应 + <devicename>COM1</devicename>， 而 <filename>cuad1</filename> + (或 <filename>/dev/cuaa1</filename>) 则对应 <devicename>COM2</devicename>， 等等。</para> </note> @@ -2223,7 +2323,12 @@ <sect3> <title>创建一个SLIP连接</title> - <indexterm><primary>SLIP</primary><secondary>connecting with</secondary></indexterm> + + <indexterm> + <primary>SLIP</primary> + <secondary>connecting with</secondary> + </indexterm> + <procedure> <step> <para>在命令提示符之后输入 <command>slip</command> 进行拨号， @@ -2247,8 +2352,8 @@ output ***\x0d, echo \x0aCONNECTED\x0a</programlisting> <para>当然， 您还需要修改用户名和口令来满足实际需要。 - 完成这些操作之后， 只需在 <application>Kermit</application> 提示符之后输入 - <command>slip</command> 就可以连接了。</para> + 完成这些操作之后， 只需在 <application>Kermit</application> + 提示符之后输入 <command>slip</command> 就可以连接了。</para> <note> <para>将密码以纯文本的形式存放在文件系统无论如何都是个 <emphasis>坏</emphasis> 主意。 @@ -2352,7 +2457,11 @@ <sect2 id="slips"> <title>设置SLIP服务器</title> - <indexterm><primary>SLIP</primary><secondary>server</secondary></indexterm> + + <indexterm> + <primary>SLIP</primary> + <secondary>server</secondary> + </indexterm> <para>本文提供了在 FreeBSD 上设置 SLIP 服务， 也就是如何配置您的系统， 使其能在远程 SLIP @@ -2423,8 +2532,8 @@ <programlisting>/etc/sliphome/slip.login 0 19200 Shelmerg dc-slip sl-helmer 0xfffffc00 autocomp</programlisting> <para>如果一切顺利 - <filename>/etc/sliphome/slip.login</filename> 将在 <command>sliplogin</command> - 绑定的 SLIP 接口上发出 + <filename>/etc/sliphome/slip.login</filename> 将在 + <command>sliplogin</command> 绑定的 SLIP 接口上发出 <command>ifconfig</command> (前述的例子中是 SLIP 接口 0， 这是 <filename>slip.login</filename> 的第一个参数)， 以设置本地 IP 地址 (<hostid>dc-slip</hostid>)、 远程 IP 地址 @@ -2433,7 +2542,8 @@ 以及任何其他标志 (<literal>autocomp</literal>)。 如果发生错误， <command>sliplogin</command> 通常会通过 <application>syslogd</application> 的 daemon facility - 记下有用的信息， 前者会把这些信息保存到 <filename>/var/log/messages</filename> + 记下有用的信息， 前者会把这些信息保存到 + <filename>/var/log/messages</filename> (参见 &man.syslogd.8; 和 &man.syslog.conf.5; 以及 <filename>/etc/syslog.conf</filename> 的联机手册， 以了解 <application>syslogd</application> 在记录什么， @@ -2443,8 +2553,15 @@ <sect3> <title>内核配置</title> - <indexterm><primary>kernel</primary><secondary>configuration</secondary></indexterm> - <indexterm><primary>SLIP</primary></indexterm> + + <indexterm> + <primary>kernel</primary> + <secondary>configuration</secondary> + </indexterm> + + <indexterm> + <primary>SLIP</primary> + </indexterm> <para>&os; 的默认内核 (<filename>GENERIC</filename>) 提供了 SLIP (&man.sl.4;) 支持； 使用定制的内核时， @@ -2597,11 +2714,16 @@ IP 节点对 SLIP 客户端 IP 地址进行 ARP 请求时， SLIP 服务器会以自已的以太网MAC地址作为回应。</para> - <indexterm><primary>Ethernet (以太网)</primary><secondary>MAC address (MAC 地址)</secondary></indexterm> + <indexterm> + <primary>Ethernet (以太网)</primary> + <secondary>MAC address (MAC 地址)</secondary> + </indexterm> + <para>当使用以上的例子时， 一定要将 - 以太网MAC地址(<hostid role="mac">00:11:22:33:44:55</hostid>)替换成您系统网卡的MAC地址， 否则<quote>ARP代理</quote>将 - 完全无法工作!您可以查看<command>netstat -i</command>输出结果以取得以太网MAC地址; - 输出的第二行应该是这样：</para> + 以太网MAC地址 （<hostid role="mac">00:11:22:33:44:55</hostid>） >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805101849.m4AInMGH063518>