From owner-p4-projects@FreeBSD.ORG Sun Oct 16 21:20:11 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4384E106567A; Sun, 16 Oct 2011 21:20:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 062371065677 for ; Sun, 16 Oct 2011 21:20:11 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id F3FA18FC15 for ; Sun, 16 Oct 2011 21:20:03 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p9GLK37T025893 for ; Sun, 16 Oct 2011 21:20:03 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p9GLK3KV025890 for perforce@freebsd.org; Sun, 16 Oct 2011 21:20:03 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 16 Oct 2011 21:20:03 GMT Message-Id: <201110162120.p9GLK3KV025890@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 200298 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Oct 2011 21:20:11 -0000 http://p4web.freebsd.org/@@200298?ac=10 Change 200298 by rene@rene_acer on 2011/10/16 21:19:25 More WIP for advanced-networking Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#58 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#58 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.28 2011/03/19 16:44:56 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml - %SRCID% 1.438 + %SRCID% 1.439 --> @@ -3328,7 +3328,7 @@ gebridged netwerk op een andere host die met een van de SPAN-poorten van de bridge verbonden is. - Om een kopie van alle frames naar het interface + Om een kopie van alle frames naar de interface fxp4 te versturen: &prompt.root; ifconfig bridge0 span fxp4 @@ -3648,12 +3648,14 @@ channel-group 1 mode active channel-protocol lacp - Maak op de &os;-machine de &man.lagg.4;-interface aan door - fxp0 en - fxp1 met IP-adres - 10.0.0.3/24 te gebruiken: + Maak de &man.lagg.4;-interface aan met + fxp0 en fxp1 en + activeer de interface met IP-adres + 10.0.0.3/24: - &prompt.root; ifconfig lagg0 create + &prompt.root; ifconfig fxp0 up +&prompt.root; ifconfig fxp1 up +&prompt.root; ifconfig lagg0 create &prompt.root; ifconfig lagg0 up laggproto lacp laggport fxp0 laggport fxp1 10.0.0.3/24 Bekijk de interfacestatus van ifconfig: @@ -3710,13 +3712,17 @@ Failover-modus kan worden gebruikt om op een secondaire interface over te schakelen wanneer de verbinding op de - meesterinterface verloren is. Creëer en configureer de + meesterinterface verloren is. Activeer de onderliggende fysieke + interface. Creëer de interface lagg0, met fxp0 als de meesterinterface en fxp1 als de secondaire - interface, met IP-adres 10.0.0.15/24: + interface en ken er IP-adres 10.0.0.15/24 + aan toe: - &prompt.root; ifconfig lagg0 create + &prompt.root; ifconfig fxp0 up +&prompt.root; ifconfig fxp1 up +&prompt.root; ifconfig lagg0 create &prompt.root; ifconfig lagg0 up laggproto failover laggport fxp0 laggport fxp1 10.0.0.15/24 De interface zal er ongeveer als volgt uitzien, de grote @@ -3798,7 +3804,7 @@ &prompt.root; ifconfig wlan0 create wlandev iwn0 ssid mijn_router up - Activeer het interface bge0. Maak het + Activeer de interface bge0. Maak het &man.lagg.4;-interface aan met bge0 als meester, en met failover naar wlan0 indien nodig: @@ -3807,7 +3813,6 @@ &prompt.root; ifconfig lagg0 create &prompt.root; ifconfig 0 up laggproto failover laggport bge0 laggport wlan0 - Het interface zal er ongeveer als volgt uitzien, de grootste verschillen zullen het MAC-adres en de apparaatnamen zijn: @@ -4581,6 +4586,170 @@ + + + + + Craig + Rodrigues + +
rodrigc@FreeBSD.org
+ + Geschreven door + + + + + Met PXE en een NFS-root-bestandssysteem opstarten + + Het Preboot eXecution Environment (PXE) van &intel; + maakt het mogelijk om het besturingssysteem over het netwerk op te + starten. Ondersteuning voor PXE wordt normaliter + aangeboden in het BIOS van moderne moederborden, waar + het kan worden aangezet in de instellingen van het BIOS + wat opstarten over het netwerk mogelijk maakt. Een volledig werkende + PXE-opstelling vereist ook correct geconfigureerde + DHCP- en TFTP-servers. + + Wanneer de gastheercomputer opstart, krijgt het informatie over + DHCP over waar de intiële bootloader staat via + TFTP. Nadat de gastheercomputer deze informatie heeft ontvangen, + downloadt het de de bootlaoder via TFTP en voert + het vervolgens de bootloader uit. Dit is gedocumenteerd in sectie 2.2.1 + van de Preboot + Execution Environment (PXE) Specification. In &os; is de + bootloader die tijdens het PXE-proces wordt opgehaald + /boot/pxeboot. Terwijl + /boot/pxeboot wordt uitgevoerd, wordt de kernel van + &os; geladen en wordt er verder gegaan met de rest van de opstartprocedure + van &os;. Kijk voor meer informatie over het opstartproces van &os; in + . + + + De <command>chroot</command>-omgeving vor het + NFS-root-bestandssysteem instellen + + + + Kies een map uit voor een installatie van &os; die over NFS + aangekoppeld kan worden. Bijvoorbeeld een map als + /b/tftpboot/FreeBSD/install. + + &prompt.root; export NFSROOTDIR=/b/tftpboot/FreeBSD/install +&prompt.root; mkdir -p ${NFSROOTDIR} + + + + Stel de NFS-server in door de instructies in op te volgen. + + + + Exporteer de map via NFS door het volgende aan + /etc/exports toe te voegen: + + /b -ro -alldirs + + + + Herstart de NFS-server: + + &prompt.root; /etc/rc.d/nfsd restart + + + + Stel &man.inetd.8; in door de stappen zoals in beschreven op te volgen. + + + + Voeg de volgende regel toe aan + /etc/inetd.conf: + + tftp dgram udp wait root /usr/libexec/tftpd tftpd -l -s /b/tftpboot + + + + Herstart inetd: + + &prompt.root; /etc/rc.d/inetd restart + + + + Herbouw de kernel en userland van + &os;: + + &prompt.root; cd /usr/src +&prompt.root; make buildworld +&prompt.root; make buildkernel + + + + Installeer &os; in de map die over NFS is + aangekoppeld: + + &prompt.root; make installworld DESTDIR=${NFSROOTDIR} +&prompt.root; make installkernel DESTDIR=${NFSROOTDIR} +&prompt.root; make distribution DESTDIR=${NFSROOTDIR} + + + + Test dat de TFTP-server werkt en dat het de + bootloader dat via PXE verkregen zal worden kan downloaden: + + &prompt.root; tftp localhost +tftp> get FreeBSD/install/boot/pxeboot +Received 264951 bytes in 0.1 seconds + + + + Voeg een regel aan ${NFSROOTDIR}/etc/fstab + toe om het root-bestandssysteem over NFS aan te koppelen: + + +# Device Mountpoint FSType Options Dump Pass +mijnhost.voorbeeld.com:/b/tftpboot/FreeBSD/install / nfs ro 0 0 + + Vervang mijnhost.voorbeeld.com door + de hostnaam of het IP-adres van uw NFS-server. + In dit voorbeeld wordt het root-bestandssysteem als alleen-lezen + aangekoppeld om te voorkomen dat NFS-cliënten + per ongeluk de inhoud van het root-bestandssysteem wissen. + + + + Stel het root-wachtwoord in voor de + &man.chroot.8;-omgeving. + + &prompt.root; chroot ${NFSROOTDIR} +&prompt.root; passwd + + Dit stelt het root-wachtwoord in voor cliëntmachines die + over PXE opstarten. + + + + Maak root-logins over SSH mogelijk voor cliëntmachines die + met PXE opstarten door + ${NFSROOTDIR}/etc/ssh/sshd_config te bewerken + en de optie PermitRootLogin aan te zetten. Dit + is gedocumenteerd in &man.sshd.config.5;. + + + + Pas andere wijzingen toe aan de &man.chroot.8;-omgeving in + ${NFSROOTDIR}. Deze wijzigingen zouden het toevoegen van pakketten + met &man.pkg.add.1;, het bewerken van het wachtwoordbestand met + &man.vipw.8; of het bewerken van &man.amd.conf.5;-projecties voor + automatisch aankopplen kunnen zijn. Bijvoorbeeld: + + &prompt.root; chroot ${NFSROOTDIR} +&prompt.root; pkg_add -r bash + + + + + ISDN From owner-p4-projects@FreeBSD.ORG Sun Oct 16 21:34:22 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5F731065676; Sun, 16 Oct 2011 21:34:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A83A7106566B for ; Sun, 16 Oct 2011 21:34:21 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 946628FC14 for ; Sun, 16 Oct 2011 21:34:21 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p9GLYLw1029542 for ; Sun, 16 Oct 2011 21:34:21 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p9GLYL6x029539 for perforce@freebsd.org; Sun, 16 Oct 2011 21:34:21 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 16 Oct 2011 21:34:21 GMT Message-Id: <201110162134.p9GLYL6x029539@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 200300 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Oct 2011 21:34:22 -0000 http://p4web.freebsd.org/@@200300?ac=10 Change 200300 by rene@rene_acer on 2011/10/16 21:33:30 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#44 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#108 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/ldap-auth/article.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/Makefile#7 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#40 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#30 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/preface/preface.sgml#9 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#113 integrate .. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv6-static.png#2 integrate .. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-configure-network-ipv4-dns.png#2 integrate .. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-configure-wireless-accesspoints.png#1 branch .. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-configure-wireless-scan.png#1 branch .. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-configure-wireless-wpa2setup.png#1 branch .. //depot/projects/docproj_nl/share/sgml/freebsd.ent#25 integrate .. //depot/projects/docproj_nl/www/en/donations/donors.sgml#43 integrate .. //depot/projects/docproj_nl/www/en/internal/developer.sgml#3 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#44 (text+ko) ==== @@ -9,7 +9,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.303 2011/09/11 18:04:15 gjb Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.304 2011/10/15 20:25:24 jmg Exp $ 1999 @@ -304,9 +304,10 @@ CVS but in Subversion. The official and exported trees are not necessarily equal. - Note that the www module containing sources - for the FreeBSD website is - contained within the doc repository. + Note that the sources for the + FreeBSD website are + contained within the www module of the + doc repository. The CVS repositories are hosted on the repository machines. Currently, each of the repositories above reside on the same physical ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#108 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -400,7 +400,7 @@ does not have copies of the installation files, but downloads them from the network during an install. The bootonly install CD is consequently much smaller, and reduces bandwidth usage - during the install by only downloaded required files. + during the install by only downloading required files. Copies of &os; installation media are available at the &os; web @@ -426,11 +426,8 @@ The memory stick image can be downloaded from the ISO-IMAGES/ directory from - ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/ - arch/arch/ISO-IMAGES/ - version/&os;-9.0-RELEASE- - arch-memstick.img. Replace - arch and + ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/arch/arch/ISO-IMAGES/version/&os;-9.0-RELEASE-arch-memstick.img. + Replace arch and version with the architecture and the version number which you want to install, respectively. For example, the memory stick @@ -508,7 +505,7 @@ Device is the drive with the memory stick. Click the folder icon and select the image to be written to the memory stick. Click - [ Save  to accept the + [ Save ] to accept the image file name. Verify that everything is correct, and that no folders on the memory stick are open in other windows. When everything is ready, click @@ -629,7 +626,7 @@ Loading /boot/defaults/loader.conf /boot/kernel/kernel text=0x64daa0 data=0xa4e80+0xa9e40 syms=[0x4+0x6cac0+0x4+0x88e9d] \ - + The &os; boot loader is displayed: @@ -915,7 +912,7 @@ probing, you will see . The install media can be used in three ways: to install &os;, as a "live CD", or to simply access a &os; shell. Use the - arrow key to choose an option, and Enter to + arrow keys to choose an option, and Enter to select.
@@ -1149,7 +1146,7 @@
The entire disk can be allocated to &os;, or just a portion - of it. If [ Entire Disk ] is + of it. If [ Entire Disk ] is chosen, a general partition layout filling the whole disk is created. Selecting [ Partition ] creates a @@ -1271,6 +1268,7 @@ UltraSPARC computers. + After the partitioning scheme has been selected and created, @@ -1488,6 +1486,79 @@ + + Configuring a Wireless Network Interface + + If a wireless network interface is chosen, wireless + identification and security parameters must be entered to + allow it to connect to the network. + + Wireless networks are identified by a Service Set + Identifier, or + SSID. The SSID is a short, unique name given to + each network. + + Most wireless networks encrypt transmitted data to protect + information from unauthorized viewing. WPA2 encryption is strongly + recommended. Older encryption types, like WEP, offer very little + security. + + The first step in connecting to a wireless network is to + scan for wireless access points. + +
+ Scanning for Wireless Access Points + + + + + +
+ + SSIDs + found during the scan are listed, followed by a description of + the encryption types available for that network. If the + desired SSID + doesn't appear in the list, select + [ Rescan ] to scan again. If + the desired network still does not appear, check for problems + with antenna connections or try moving the computer closer to + the access point. Rescan after each change is made. + +
+ Choosing A Wireless Network + + + + + +
+ + The encryption information for connecting to the selected + wireless network is entered after selecting the network. With + WPA2, only + a password (also known as the Pre-Shared Key, or PSK) is needed. Characters + typed into the input box are shown as asterisks for + security. + +
+ WPA2 Setup + + + + + +
+ + Network configuration continues after selection of the + wireless network and entry of the connection + information. + + Configuring IPv4 Networking @@ -2022,7 +2093,7 @@ If further configuration or special setup is needed, - selecting [ Live CD ] will boot + selecting [ Live CD ] will boot the install media into Live CD mode. When the installation is complete, select ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#40 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2402,6 +2402,15 @@ + RELENG_9 + + + The line of development for &os;-9.X, also known + as &os; 9-STABLE + + + + RELENG_8 ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#30 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2645,22 +2645,44 @@ - Edit your /etc/rc.conf to - include the following: + By default, DHCP configuration on &os; runs in the + background, or asynchronously. + Other startup scripts continue to run while DHCP + completes, speeding up system startup. + + Background DHCP works well when the DHCP server + responds quickly to requests and the DHCP configuration + process goes quickly. However, DHCP may take a long time + to complete on some systems. If network services attempt + to run before DHCP has completed, they will fail. Using + DHCP in synchronous mode prevents + the problem, pausing startup until DHCP configuration has + completed. + + To connect to a DHCP server in the background while + other startup continues (asynchronous mode), use the + DHCP value in + /etc/rc.conf: + + ifconfig_fxp0="DHCP" + + To pause startup while DHCP completes, use synchronous + mode with the SYNCDHCP + value: - ifconfig_fxp0="DHCP" + ifconfig_fxp0="SYNCDHCP" - Be sure to replace fxp0 with the - designation for the interface that you wish to dynamically - configure, as described in + Replace the fxp0 shown in + these examples with the name of the interface to be + dynamically configured, as described in . If you are using a different location for dhclient, or if you wish to pass additional - flags to dhclient, also include the - following (editing as necessary): + flags to dhclient, also include + (editing as necessary): dhclient_program="/sbin/dhclient" dhclient_flags="" ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/preface/preface.sgml#9 (text+ko) ==== @@ -1,5 +1,5 @@ @@ -57,6 +57,14 @@ been added with information about installing &os; on virtualization software. + + + , Installing + &os; 9.x and Later, has been + added to cover installation of &os; using the new + installation utility, + bsdinstall. + Changes from the @@ -274,11 +282,23 @@ - , Installation + , Installation of + &os; 8.x and Earlier + + Walks a user through the entire installation process of + &os; 8.x and earlier using + sysinstall. Some advanced installation + topics, such as installing through a serial console, are also + covered. + + + + , Installation of + &os; 9.x and Later - Walks a user through the entire installation process. - Some advanced installation topics, such as installing through - a serial console, are also covered. + Walks a user through the entire installation process of + &os; 9.x and later using + bsdinstall. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#113 (text+ko) ==== @@ -1,7 +1,7 @@ + 900040 + July 19, 2011 + Increase default MAXCPU for FreeBSD to 64 on amd64 and ia64 and to 128 for XLP (mips). + + + 900041 August 13, 2011 9.0-CURRENT after the implementation of Capsicum capabilities; fget(9) gains a rights argument. + + 900042 + August 28, 2011 + Bump shared libraries' version numbers for libraries + whose ABI has changed in preparation for 9.0. + + + 900043 + September 2, 2011 + Add automatic detection of USB mass storage devices + which do not support the no synchronize cache SCSI command. + + + 900044 + September 10, 2011 + Re-factor auto-quirk. + + + 900045 + Oct 13, 2011 + All non-compatibility system call entry points have been prefixed with sys_. + ==== //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv6-static.png#2 (text+ko) ==== @@ -1,23 +1,20 @@ PNG  --9-"-nm\^_yqJ;7I_\|mK?&p>->,xn"E)R蓋--\2:2۴O;탎T'PO -Lח&>Wt()5pFG{Wp ӳ/_v , AHƴhm^xk8lҏ"[Jy>8j鈚a}8j|7xAd|禦hvs-biKMQ0w)Xa)3O)[SZޢS+%zc|l^+ ]MР?}_?2f5p4q6tjٚzNmsݱg_KޫpN$nVVc砐mRs~iju54tʧ}ʌ>[?_WR D49rv״hN96r՘ͩd,8FkkZ:-e{ Vobj$ؼM-4b7>MGqbpw`d`)ܮwCa<~hai<0hvm J oK˪^G#>S~VK RewEA 3 -n{wAKOiNx[7kE2GKRfo#-lE,^Xݶ*܇*Wpըs{od(^Ħe4`2aP5 fWT< -Ԯ6O̍/f'\cvHl״KdKTfvl]Ôċzǭs|JhzO80m-T\ No newline at end of file +++ÒaZq+3+ kʷ~kmSV5T0 >x4s,^Y d:ҥvP*F"C[qI)ᢴh}~~78p3Q4W8Y4PR(aaW>4Vk>Q(h2Cv6&?wp=\U m#$p̏?3HQۢq~fŲ +ǧիHQE_0j le{+d:)ÛʺRyӆjy}cw:C*'F;a43h<_[:62*Sƙ&j]+/άbk~4(\a"4xrGN7τXV|#Z~![Ew-ڇ0mlΥ3JWeK5l|:6+=d]gVWjUZ^4VfZ0}e՛گ mUh5*UTS L^7ᘎћYEs +nb_ +y;d7mE˥ZW~//+LZT]m-~njէxU7su sA2yS) +eֶi#-=ƙ$9E̝Fէ֡U_~ej +ZWt6+/m;FмA}чS qtiT1EcA'dz:WGW]52+\<`ɴuEUm5occ޳dDff֐ 9Ej䋀.hFtI,4]Y [Fwyac"lqyT~i#G-pw)Y^lT5b2I] u[i;ݖ,^Yl۴pG74J'R0i&cx.UYMsj4Yɼ~-w$_/_.2]Y ؿ_|d[TVQw'wavRf$̃N:9zZ]^I~Ntks|5ǃ J 8> wwp34O8Y4PRe򇙧ayj͇S6 NHطU8>uNU ŋȐ +ًl+_ftDU~·{+ @@vߥLVf ?6uYE++++p++Z#\^Ŧ=SeDzcuWPᛒ_uWZU惈z8cӨ);!cؘq'ۭ㻺US?^QW?V#3oVSwˆkpd3zLͫxIe2G u+V`9q驖Zvr-C&wM>3DblX!W7qdczK{'Ɲ,\6p 2i#:,s,6E;21H'nO_[M +:x̤W;kl v$Ag99z8a'W[U3􁁃 kll*; WR+/7{OɵnY=VJZ8|5VX]ګu8n+pL_LQݵf,F"!N8{ޕ99m-c׊Q6+&wb:Nf`8+٪@ٌC*߉HÓ^H\ No newline at end of file ==== //depot/projects/docproj_nl/share/sgml/freebsd.ent#25 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2512,6 +2512,15 @@ + RELENG_9 + + + De ontwikkellijn voor &os;-9.X, ook bekend als + &os; 9-STABLE. + + + + RELENG_8 From owner-p4-projects@FreeBSD.ORG Fri Oct 21 16:19:21 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B41CB1065757; Fri, 21 Oct 2011 16:19:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7590B1065744 for ; Fri, 21 Oct 2011 16:19:21 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 4969A8FC12 for ; Fri, 21 Oct 2011 16:19:21 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p9LGJLHF024363 for ; Fri, 21 Oct 2011 16:19:21 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p9LGJLWW024360 for perforce@freebsd.org; Fri, 21 Oct 2011 16:19:21 GMT (envelope-from jhb@freebsd.org) Date: Fri, 21 Oct 2011 16:19:21 GMT Message-Id: <201110211619.p9LGJLWW024360@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 200530 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Oct 2011 16:19:21 -0000 http://p4web.freebsd.org/@@200530?ac=10 Change 200530 by jhb@jhb_jhbbsd on 2011/10/21 16:18:30 A nit from mdf. Affected files ... .. //depot/projects/fadvise/sys/sys/fcntl.h#3 edit Differences ... ==== //depot/projects/fadvise/sys/sys/fcntl.h#3 (text+ko) ==== @@ -305,10 +305,6 @@ #define POSIX_FADV_NOREUSE _FADV_NOREUSE #endif -/* - * XXX missing posix_fadvise() and POSIX_FADV_* macros. - */ - #ifndef _KERNEL __BEGIN_DECLS int open(const char *, int, ...); From owner-p4-projects@FreeBSD.ORG Fri Oct 21 17:48:12 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFFDE1065677; Fri, 21 Oct 2011 17:48:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 92ABC106564A for ; Fri, 21 Oct 2011 17:48:11 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 7FD4D8FC14 for ; Fri, 21 Oct 2011 17:48:11 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p9LHmBn4041824 for ; Fri, 21 Oct 2011 17:48:11 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p9LHmBji041821 for perforce@freebsd.org; Fri, 21 Oct 2011 17:48:11 GMT (envelope-from jhb@freebsd.org) Date: Fri, 21 Oct 2011 17:48:11 GMT Message-Id: <201110211748.p9LHmBji041821@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 200534 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Oct 2011 17:48:12 -0000 http://p4web.freebsd.org/@@200534?ac=10 Change 200534 by jhb@jhb_jhbbsd on 2011/10/21 17:47:20 - A nit from mdf. - Rework FADV_DONTNEED. vm_object_sync() did not work because the buffer cache still had buffers holding onto the pages, so vm_object_page_remove() did not actually remove any pages. vinvalbuf() will flush all the open buffers (though it is a bit heavy-handed as it does all of the buffers and not just buffers for the requested range). Affected files ... .. //depot/projects/fadvise/sys/kern/vfs_syscalls.c#7 edit Differences ... ==== //depot/projects/fadvise/sys/kern/vfs_syscalls.c#7 (text+ko) ==== @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include @@ -4861,7 +4862,7 @@ int error, vfslocked; if (uap->offset < 0 || uap->len < 0 || - uap->offset + uap->len < uap->offset) + uap->offset > OFF_MAX - uap->len) return (EINVAL); switch (uap->advice) { case FADV_NORMAL: @@ -4959,12 +4960,24 @@ break; case FADV_DONTNEED: /* - * Invalidate pages from the backing VM object similar - * to msync(MS_INVALIDATE). + * Flush any open FS buffers and then remove pages + * from the backing VM object. */ - if (vp->v_object != NULL) - vm_object_sync(vp->v_object, uap->offset, end - uap->offset, - FALSE, TRUE); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); + if (vp->v_iflag & VI_DOOMED) { + VOP_UNLOCK(vp, 0); + break; + } + vinvalbuf(vp, V_NORMAL, 0, 0); + if (vp->v_object != NULL) { + start = trunc_page(uap->offset); + end = round_page(end); + VM_OBJECT_LOCK(vp->v_object); + vm_object_page_remove(vp->v_object, OFF_TO_IDX(start), + OFF_TO_IDX(end), OBJPR_CLEANONLY | OBJPR_DEBUG); + VM_OBJECT_UNLOCK(vp->v_object); + } + VOP_UNLOCK(vp, 0); break; } out: From owner-p4-projects@FreeBSD.ORG Fri Oct 21 19:22:36 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9C441065670; Fri, 21 Oct 2011 19:22:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7C6CD106564A for ; Fri, 21 Oct 2011 19:22:36 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 692098FC14 for ; Fri, 21 Oct 2011 19:22:36 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p9LJManb061945 for ; Fri, 21 Oct 2011 19:22:36 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p9LJMajE061942 for perforce@freebsd.org; Fri, 21 Oct 2011 19:22:36 GMT (envelope-from jhb@freebsd.org) Date: Fri, 21 Oct 2011 19:22:36 GMT Message-Id: <201110211922.p9LJMajE061942@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 200537 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Oct 2011 19:22:37 -0000 http://p4web.freebsd.org/@@200537?ac=10 Change 200537 by jhb@jhb_jhbbsd on 2011/10/21 19:22:32 - Add a new VOP_ADVISE() to service "immediate" fadvise() requests (FADV_*NEED). - Add a vop_stdadvise() based on the current fadvise() implementation. Affected files ... .. //depot/projects/fadvise/sys/kern/vfs_default.c#2 edit .. //depot/projects/fadvise/sys/kern/vfs_syscalls.c#8 edit .. //depot/projects/fadvise/sys/kern/vnode_if.src#2 edit .. //depot/projects/fadvise/sys/sys/vnode.h#2 edit Differences ... ==== //depot/projects/fadvise/sys/kern/vfs_default.c#2 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -96,6 +97,7 @@ .vop_access = vop_stdaccess, .vop_accessx = vop_stdaccessx, + .vop_advise = vop_stdadvise, .vop_advlock = vop_stdadvlock, .vop_advlockasync = vop_stdadvlockasync, .vop_advlockpurge = vop_stdadvlockpurge, @@ -984,6 +986,67 @@ return (error); } +int +vop_stdadvise(struct vop_advise_args *ap) +{ + struct vnode *vp; + off_t start, end; + int error, vfslocked; + + vp = ap->a_vp; + switch (ap->a_advice) { + case FADV_WILLNEED: + /* + * Apply the request to the backing VM object. + * + * XXX: madvise(MADV_WILLNEED) will not do readahead on + * a file, perhaps FADV_WILLNEED should. + */ + start = trunc_page(ap->a_start); + end = round_page(ap->a_end); + vfslocked = VFS_LOCK_GIANT(vp->v_mount); + vn_lock(vp, LK_SHARED | LK_RETRY); + if (vp->v_object != NULL) + vm_object_madvise(vp->v_object, OFF_TO_IDX(start), + atop(end - start), MADV_WILLNEED); + VOP_UNLOCK(vp, 0); + VFS_UNLOCK_GIANT(vfslocked); + error = 0; + break; + case FADV_DONTNEED: + /* + * Flush any open FS buffers and then remove pages + * from the backing VM object. Using vinvalbuf() here + * is a bit heavy-handed as it flushes all buffers for + * the given vnode, not just the buffers covering the + * requested range. + */ + error = 0; + vfslocked = VFS_LOCK_GIANT(vp->v_mount); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); + if (vp->v_iflag & VI_DOOMED) { + VOP_UNLOCK(vp, 0); + break; + } + vinvalbuf(vp, V_NORMAL, 0, 0); + if (vp->v_object != NULL) { + start = trunc_page(ap->a_start); + end = round_page(ap->a_end); + VM_OBJECT_LOCK(vp->v_object); + vm_object_page_remove(vp->v_object, OFF_TO_IDX(start), + OFF_TO_IDX(end), OBJPR_CLEANONLY | OBJPR_DEBUG); + VM_OBJECT_UNLOCK(vp->v_object); + } + VOP_UNLOCK(vp, 0); + VFS_UNLOCK_GIANT(vfslocked); + break; + default: + error = EINVAL; + break; + } + return (error); +} + /* * vfs default ops * used to fill the vfs function table to get reasonable default return values. ==== //depot/projects/fadvise/sys/kern/vfs_syscalls.c#8 (text+ko) ==== @@ -61,7 +61,6 @@ #include #include #include -#include #include #include #include @@ -4858,8 +4857,8 @@ { struct file *fp; struct vnode *vp; - off_t start, end; - int error, vfslocked; + off_t end; + int error; if (uap->offset < 0 || uap->len < 0 || uap->offset > OFF_MAX - uap->len) @@ -4942,42 +4941,8 @@ mtx_pool_unlock(mtxpool_sleep, fp); break; case FADV_WILLNEED: - /* - * Apply the request to the backing VM object. - * - * XXX: madvise(MADV_WILLNEED) will not do readahead on - * a file, perhaps FADV_WILLNEED should. - */ - start = trunc_page(uap->offset); - end = round_page(end); - vfslocked = VFS_LOCK_GIANT(vp->v_mount); - vn_lock(vp, LK_SHARED | LK_RETRY); - if (vp->v_object != NULL) - vm_object_madvise(vp->v_object, OFF_TO_IDX(start), - atop(end - start), MADV_WILLNEED); - VOP_UNLOCK(vp, 0); - VFS_UNLOCK_GIANT(vfslocked); - break; case FADV_DONTNEED: - /* - * Flush any open FS buffers and then remove pages - * from the backing VM object. - */ - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); - if (vp->v_iflag & VI_DOOMED) { - VOP_UNLOCK(vp, 0); - break; - } - vinvalbuf(vp, V_NORMAL, 0, 0); - if (vp->v_object != NULL) { - start = trunc_page(uap->offset); - end = round_page(end); - VM_OBJECT_LOCK(vp->v_object); - vm_object_page_remove(vp->v_object, OFF_TO_IDX(start), - OFF_TO_IDX(end), OBJPR_CLEANONLY | OBJPR_DEBUG); - VM_OBJECT_UNLOCK(vp->v_object); - } - VOP_UNLOCK(vp, 0); + error = VOP_ADVISE(vp, uap->offset, end, uap->advice); break; } out: ==== //depot/projects/fadvise/sys/kern/vnode_if.src#2 (text+ko) ==== @@ -628,3 +628,12 @@ INOUT off_t *offset; INOUT off_t *len; }; + +%% advise vp U U U + +vop_advise { + IN struct vnode *vp; + IN off_t start; + IN off_t end; + IN int advice; +}; ==== //depot/projects/fadvise/sys/sys/vnode.h#2 (text+ko) ==== @@ -685,6 +685,7 @@ int vop_nopoll(struct vop_poll_args *); int vop_stdaccess(struct vop_access_args *ap); int vop_stdaccessx(struct vop_accessx_args *ap); +int vop_stdadvise(struct vop_advise_args *ap); int vop_stdadvlock(struct vop_advlock_args *ap); int vop_stdadvlockasync(struct vop_advlockasync_args *ap); int vop_stdadvlockpurge(struct vop_advlockpurge_args *ap); From owner-p4-projects@FreeBSD.ORG Fri Oct 21 19:25:54 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D8F51065674; Fri, 21 Oct 2011 19:25:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60283106566C for ; Fri, 21 Oct 2011 19:25:54 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 4D7D48FC0C for ; Fri, 21 Oct 2011 19:25:54 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p9LJPslF062052 for ; Fri, 21 Oct 2011 19:25:54 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p9LJPsvZ062049 for perforce@freebsd.org; Fri, 21 Oct 2011 19:25:54 GMT (envelope-from jhb@freebsd.org) Date: Fri, 21 Oct 2011 19:25:54 GMT Message-Id: <201110211925.p9LJPsvZ062049@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 200538 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Oct 2011 19:25:54 -0000 http://p4web.freebsd.org/@@200538?ac=10 Change 200538 by jhb@jhb_jhbbsd on 2011/10/21 19:25:05 Drop the default FADV_WILLNEED implementation as it doesn't really work and marking any pages that happen to be in RAM as active isn't really the right approach either. Instead, punt and require each FS to implement this. Affected files ... .. //depot/projects/fadvise/sys/kern/vfs_default.c#3 edit Differences ... ==== //depot/projects/fadvise/sys/kern/vfs_default.c#3 (text+ko) ==== @@ -46,7 +46,6 @@ #include #include #include -#include #include #include #include @@ -997,20 +996,10 @@ switch (ap->a_advice) { case FADV_WILLNEED: /* - * Apply the request to the backing VM object. - * - * XXX: madvise(MADV_WILLNEED) will not do readahead on - * a file, perhaps FADV_WILLNEED should. + * Do nothing for now. Filesystems should provide a + * custom method which starts an asynchronous read of + * the requested region. */ - start = trunc_page(ap->a_start); - end = round_page(ap->a_end); - vfslocked = VFS_LOCK_GIANT(vp->v_mount); - vn_lock(vp, LK_SHARED | LK_RETRY); - if (vp->v_object != NULL) - vm_object_madvise(vp->v_object, OFF_TO_IDX(start), - atop(end - start), MADV_WILLNEED); - VOP_UNLOCK(vp, 0); - VFS_UNLOCK_GIANT(vfslocked); error = 0; break; case FADV_DONTNEED: From owner-p4-projects@FreeBSD.ORG Fri Oct 21 19:25:55 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75611106576C; Fri, 21 Oct 2011 19:25:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A219B1065675 for ; Fri, 21 Oct 2011 19:25:54 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 8F8C78FC18 for ; Fri, 21 Oct 2011 19:25:54 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p9LJPsRO062059 for ; Fri, 21 Oct 2011 19:25:54 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p9LJPsMG062055 for perforce@freebsd.org; Fri, 21 Oct 2011 19:25:54 GMT (envelope-from jhb@freebsd.org) Date: Fri, 21 Oct 2011 19:25:54 GMT Message-Id: <201110211925.p9LJPsMG062055@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 200539 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Oct 2011 19:25:55 -0000 http://p4web.freebsd.org/@@200539?ac=10 Change 200539 by jhb@jhb_jhbbsd on 2011/10/21 19:25:31 Trim some debugging. Affected files ... .. //depot/projects/fadvise/sys/kern/vfs_default.c#4 edit Differences ... ==== //depot/projects/fadvise/sys/kern/vfs_default.c#4 (text+ko) ==== @@ -1023,7 +1023,7 @@ end = round_page(ap->a_end); VM_OBJECT_LOCK(vp->v_object); vm_object_page_remove(vp->v_object, OFF_TO_IDX(start), - OFF_TO_IDX(end), OBJPR_CLEANONLY | OBJPR_DEBUG); + OFF_TO_IDX(end), OBJPR_CLEANONLY); VM_OBJECT_UNLOCK(vp->v_object); } VOP_UNLOCK(vp, 0); From owner-p4-projects@FreeBSD.ORG Fri Oct 21 21:03:31 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA092106567A; Fri, 21 Oct 2011 21:03:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C2191065678 for ; Fri, 21 Oct 2011 21:03:30 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 581C28FC1A for ; Fri, 21 Oct 2011 21:03:30 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p9LL3UDH082857 for ; Fri, 21 Oct 2011 21:03:30 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p9LL3T1v082854 for perforce@freebsd.org; Fri, 21 Oct 2011 21:03:29 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 21 Oct 2011 21:03:29 GMT Message-Id: <201110212103.p9LL3T1v082854@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 200542 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Oct 2011 21:03:31 -0000 http://p4web.freebsd.org/@@200542?ac=10 Change 200542 by rene@rene_acer on 2011/10/21 21:03:24 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#109 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#32 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#28 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#16 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#15 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#12 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#31 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#14 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#27 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#61 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#66 integrate .. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv4-static.png#2 integrate .. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-configure-network-ipv4-dns.png#3 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#58 integrate .. //depot/projects/docproj_nl/share/pgpkeys/sbruno.key#1 branch .. //depot/projects/docproj_nl/share/sgml/man-refs.ent#32 integrate .. //depot/projects/docproj_nl/www/share/sgml/release.ent#38 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#109 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -24,6 +24,16 @@ This chapter documents various guidelines and policies in force for the FreeBSD source tree. + + + Style Guidelines + style + + Consistent coding style is extremely important, particularly + with large projects like &os;. Code should follow the &os; coding + styles described in &man.style.9; and + &man.style.Makefile.5;. + <makevar>MAINTAINER</makevar> on Makefiles ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#32 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -525,8 +525,8 @@ Destination Gateway Flags Refs Use Netif Expire default 10.0.0.1 UGS 0 49378 xl0 127.0.0.1 127.0.0.1 UH 0 6 lo0 -10.0.0/24 link#1 UC 0 0 xl0 -192.168.1/24 link#2 UC 0 0 xl1 +10.0.0.0/24 link#1 UC 0 0 xl0 +192.168.1.0/24 link#2 UC 0 0 xl1 With the current routing table RouterA will not be able to reach our Internal Net 2. It does not @@ -3785,9 +3785,9 @@ both BOOTP and DHCP requests. ISC DHCP - 3.1 is not part of the base + 4.2 is not part of the base system. You will first need to install the - net/isc-dhcp31-server port or the + net/isc-dhcp42-server port or the corresponding package. Once ISC DHCP is installed, it ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -664,8 +664,9 @@ F on non-&apple; keyboards. At the 0 > - prompt, enter - boot cd:,\ppc\loader cd:0 + prompt, enter + + boot cd:,\ppc\loader cd:0 For Xserves without keyboards, see &apple;'s @@ -931,8 +932,20 @@ Introducing <application>bsdinstall</application> - bsdinstall is a text-based installation - application used to install and configure &os;. + + bsdinstall is a text-based &os; + installer program written by &a.nwhitehorn; and introduced in 2011 + for &os; 9.0. + + + Kris Moore's pc-sysinstall is + included with PC-BSD, and + can also be used to + install &os;. Although sometimes confused with + bsdinstall, the two are not + related. + The bsdinstall menu system is controlled by the arrow keys, Enter, Tab, @@ -1474,7 +1487,8 @@ installation. - Choose the network interface to be used. + A list of all the network interfaces found on the computer + is shown next. Select one to be configured.
Choose a Network Interface ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#28 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -248,6 +248,11 @@ + &a.desktop.name; + Using and improving &os; on the desktop + + + &a.doc.name; Creating FreeBSD related documents @@ -1084,6 +1089,19 @@ + &a.desktop.name; + + + Using and improving &os; on the desktop + + This is a forum for discussion of &os; on the + desktop. It is primarily a place for desktop porters + and users to discuss issues and improve &os;'s desktop + support. + + + + &a.doc.name; ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#16 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -370,9 +370,11 @@ url="http://www.openbsd.org/faq/pf/">PF FAQ, please keep in mind that different versions of &os; can contain different versions of PF. Currently, - &os; is + &os; 8.X and prior is using the same version of PF as - OpenBSD 4.1. + OpenBSD 4.1. &os; 9.X and + later is using the same version of PF as + OpenBSD 4.5. The &a.pf; is a good place to ask questions about ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#15 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -300,7 +300,7 @@ If the directory /usr/src/ does not exist on your system (or if it is empty), then the sources have not been installed. The easiest way to install the full source - tree is is to run sysinstall as + tree is to run sysinstall as root, and then choosing Configure, then Distributions, then @@ -308,7 +308,7 @@ All. If it does not exist, you should also create a symlink to /usr/src/sys/: - &prompt.root; ln -s /usr/src/sys/ /sys/ + &prompt.root; ln -s /usr/src/sys /sys Next, change to the ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#12 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -196,7 +196,7 @@ url="http://www.iana.org/assignments/character-sets">IANA Registry. - &os; use X11-compatible locale encodings instead. + &os; uses X11-compatible locale encodings instead. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#31 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2564,7 +2564,7 @@ client-side program, dhclient, comes integrated within FreeBSD, and the server-side portion is available from the net/isc-dhcp31-server port. The + role="package">net/isc-dhcp42-server port. The &man.dhclient.8;, &man.dhcp-options.5;, and &man.dhclient.conf.5; manual pages, in addition to the references below, are useful resources. @@ -2695,7 +2695,7 @@ The DHCP server, dhcpd, is included as part of the net/isc-dhcp31-server port in the ports + role="package">net/isc-dhcp42-server port in the ports collection. This port contains the ISC DHCP server and documentation. @@ -2759,7 +2759,7 @@ The server is not provided as part of FreeBSD, and so you will need to install the - net/isc-dhcp31-server + net/isc-dhcp42-server port to provide this service. See for more information on using the Ports Collection. @@ -2798,7 +2798,7 @@ The next thing that you will need to do is edit the sample dhcpd.conf which was installed by the - net/isc-dhcp31-server port. + net/isc-dhcp42-server port. By default, this will be /usr/local/etc/dhcpd.conf.sample, and you should copy this to @@ -2962,7 +2962,7 @@ environments where one DHCP server forwards a request from a client to another DHCP server on a separate network. If you require this functionality, then install the net/isc-dhcp31-relay port. The + role="package">net/isc-dhcp42-relay port. The &man.dhcrelay.8; manual page provided with the port contains more detail. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#14 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1058,7 +1058,7 @@ build options which can enable/disable parts of the application which are unneeded, certain security options, and other customizations. A few which come to mind are - www/mozilla, www/firefox, security/gpgme, and mail/sylpheed-claws. A message will be displayed when options such as these are ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#27 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -158,6 +158,10 @@ FreeBSD based Databases mailing list"> freebsd-database"> + +Using and improving &os; on the desktop"> +freebsd-desktop"> + ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#61 (text+ko) ==== @@ -1,7 +1,7 @@ + @@ -298,6 +298,7 @@ + ==== //depot/projects/docproj_nl/share/sgml/man-refs.ent#32 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.513 2011/08/25 20:27:19 brueffer Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.514 2011/10/17 18:10:51 bcr Exp $ --> @@ -4047,6 +4047,7 @@ + ==== //depot/projects/docproj_nl/www/share/sgml/release.ent#38 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -596,8 +596,8 @@ Destination Gateway Flags Refs Use Netif Expire default 10.0.0.1 UGS 0 49378 xl0 127.0.0.1 127.0.0.1 UH 0 6 lo0 -10.0.0/24 link#1 UC 0 0 xl0 -192.168.1/24 link#2 UC 0 0 xl1 +10.0.0.0/24 link#1 UC 0 0 xl0 +192.168.1.0/24 link#2 UC 0 0 xl1 Met de huidige routeertabel is RouterA niet in staat om Intern Net 2 te bereiken. Het heeft geen @@ -4104,9 +4104,9 @@ verzoeken voor BOOTP als DHCP beantwoorden. - ISC DHCP 3.1 maakt geen deel + ISC DHCP 4.2 maakt geen deel uit van het basissysteem. Eerst dient de poort net/isc-dhcp31-server of het + role="package">net/isc-dhcp42-server of het corresponderende pakket geïnstalleerd te worden. Wanneer ISC DHCP is ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#45 (text+ko) ==== @@ -5,7 +5,7 @@ Vertaald door: Siebrand Mazeland / Rene Ladan %SOURCE% en_US.ISO8859-1/books/handbook/eresources/chapter.sgml - %SRCID% 1.213 + %SRCID% 1.215 --> @@ -296,6 +296,12 @@ + &a.desktop.name; + + &os; gebruiken op en verbeteren voor bureaubladen + + + &a.doc.name; Het maken van &os;-gerelateerde documenten @@ -1285,6 +1291,20 @@ + &a.desktop.name; + + + &os; gebruiken op en verbeteren voor + bureaubladen + + Dit is een forum voor het bespreken van &os; op desktops. Het + is vooral een plaats voor porters en gebruikers van + bureaubladomgevingen om zaken te bespreken en de ondersteuning van + &os; op het bureaublad te verbeteren. + + + + &a.doc.name; ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#26 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.17 2011/05/11 18:58:09 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml - %SRCID% 1.96 + %SRCID% 1.97 --> @@ -394,9 +394,10 @@ Houd tijdens het doornemen van de PF FAQ in de gaten dat verschillende versies van &os; verschillende versies van PF kunnen - bevatten. Momenteel gebruikt - &os; dezelfde versie van PF als - OpenBSD 4.1. + bevatten. Momenteel gebruikt &os; 8.X + dezelfde versie van PF als OpenBSD 4.1. + &os; 9.X en hoger gebruiken dezelfde + versie van PF als OpenBSD 4.5. De &a.pf; is een goede plaats om vragen over het instellen ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#23 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.21 2011/09/07 21:06:52 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml - %SRCID% 1.199 + %SRCID% 1.200 --> @@ -337,7 +337,7 @@ Als de map /usr/src/ niet aanwezig is op een systeem (of als het leeg is), dan is de broncode niet geïnstalleerd. De eenvoudigste - manier om de volledige brondcode te installeren is door + manier om de volledige broncode te installeren is om sysinstall te draaien als root en Configure, dan @@ -347,7 +347,7 @@ symbolische link naar /usr/src/sys aan te maken: - &prompt.root; ln -s /usr/src/sys/ /sys/ + &prompt.root; ln -s /usr/src/sys /sys Daarna kan vanuit de map ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml#18 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml,v 1.18 2011/02/02 08:58:23 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/l10n/chapter.sgml - %SRCID% 1.134 + %SRCID% 1.135 --> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#23 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.23 2011/06/19 14:48:42 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/ports/chapter.sgml - %SRCID% 1.292 + %SRCID% 1.293 --> @@ -1142,7 +1142,7 @@ onderdelen (niet gebruikt, beveiligingsinstellingen en andere aanpassingen) van de applicatie in- of uitschakelen. Voorbeelden van ports waarbij dat het geval is zijn www/mozilla, www/firefox, security/gpgme en mail/sylpheed-claws. Er wordt een bericht getoond als dit soort instellingen beschikbaar ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#39 (text+ko) ==== @@ -5,7 +5,7 @@ Vertaald door: Siebrand Mazeland / Rene Ladan %SOURCE% en_US.ISO8859-1/share/sgml/mailing-lists.ent - %SRCID% 1.85 + %SRCID% 1.86 --> @@ -162,6 +162,10 @@ &os; gebaseerde Databases mailinglijst"> freebsd-database"> + +&os; gebruiken op en verbeteren voor bureaubladen"> +freebsd-desktop"> +