PERFORCE change 134151 for review
John Birrell
jb at FreeBSD.org
Sat Jan 26 13:46:51 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=134151
Change 134151 by jb at jb_freebsd1 on 2008/01/26 21:46:37
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#9 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#10 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/basics/chapter.sgml#7 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/ports/chapter.sgml#9 integrate
.. //depot/projects/dtrace/ports/UPDATING#49 integrate
.. //depot/projects/dtrace/src/ObsoleteFiles.inc#36 integrate
.. //depot/projects/dtrace/src/UPDATING#23 integrate
.. //depot/projects/dtrace/src/etc/devd.conf#5 integrate
.. //depot/projects/dtrace/src/etc/netstart#4 integrate
.. //depot/projects/dtrace/src/etc/rc#5 integrate
.. //depot/projects/dtrace/src/etc/rc.d/ipfw#7 integrate
.. //depot/projects/dtrace/src/etc/rc.d/mountcritremote#7 integrate
.. //depot/projects/dtrace/src/etc/rc.d/netif#6 integrate
.. //depot/projects/dtrace/src/etc/rc.d/ppp#8 integrate
.. //depot/projects/dtrace/src/etc/rc.subr#16 integrate
.. //depot/projects/dtrace/src/include/fts.h#4 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#12 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/Symbol.map#5 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/fts-compat.c#2 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/fts-compat.h#2 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/fts.3#5 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/fts.c#5 integrate
.. //depot/projects/dtrace/src/sbin/quotacheck/Makefile#4 integrate
.. //depot/projects/dtrace/src/sbin/quotacheck/preen.c#5 integrate
.. //depot/projects/dtrace/src/sbin/quotacheck/quotacheck.8#6 integrate
.. //depot/projects/dtrace/src/sbin/quotacheck/quotacheck.c#8 integrate
.. //depot/projects/dtrace/src/sbin/quotacheck/quotacheck.h#1 branch
.. //depot/projects/dtrace/src/share/man/man4/Makefile#28 integrate
.. //depot/projects/dtrace/src/share/man/man4/dcons.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/oldcard.4#4 delete
.. //depot/projects/dtrace/src/share/man/man5/fstab.5#5 integrate
.. //depot/projects/dtrace/src/sys/ddb/db_capture.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/uark.c#3 integrate
.. //depot/projects/dtrace/src/sys/fs/fifofs/fifo_vnops.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/tty_pty.c#12 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powermac/ata_kauai.c#4 integrate
.. //depot/projects/dtrace/src/sys/sys/param.h#35 integrate
.. //depot/projects/dtrace/src/usr.bin/xargs/xargs.1#5 integrate
.. //depot/projects/dtrace/www/en/cgi/dosendpr.cgi#6 integrate
.. //depot/projects/dtrace/www/en/cgi/query-pr.cgi#12 integrate
.. //depot/projects/dtrace/www/share/sgml/events.xml#20 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#9 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.177 2008/01/24 09:50:06 trhodes Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.179 2008/01/26 12:00:57 keramida Exp $
-->
<chapter id="kernelconfig">
@@ -723,8 +723,8 @@
<programlisting>options KBD_INSTALL_CDEV # install a CDEV entry in /dev</programlisting>
- <para>This option is related to the keyboard. It installs a CDEV entry
- in <filename>/dev</filename>.</para>
+ <para>This option is required to allow the creation of keyboard device
+ nodes in <filename>/dev</filename>.</para>
<programlisting>options ADAPTIVE_GIANT # Giant mutex is adaptive.</programlisting>
@@ -740,6 +740,15 @@
sleep and wait for its next chance to run. If you are not sure,
leave this in.</para>
+ <note>
+ <para>Note that on &os; 8.0-CURRENT and later versions, all mutexes are
+ adaptive by default, unless explicitly set to non-adaptive by
+ compiling with the <literal>NO_ADAPTIVE_MUTEXES</literal> option. As
+ a result, Giant is adaptive by default now, and the
+ <literal>ADAPTIVE_GIANT</literal> option has been removed from the
+ kernel configuration.</para>
+ </note>
+
<indexterm>
<primary>kernel options</primary>
<secondary>SMP</secondary>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#10 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.269 2007/12/21 21:14:19 gabor Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.271 2008/01/26 16:08:36 chinsan Exp $
-->
<chapter id="ports">
@@ -301,6 +301,15 @@
directory.</para></listitem>
<listitem>
+ <para>Additionally, you can use a simple &man.echo.1; statement
+ to find where a port exists in the ports tree. For
+ example:</para>
+
+ <screen>&prompt.root; <userinput>echo /usr/ports/*/*lsof*</userinput>
+/usr/ports/sysutils/lsof</screen>
+ </listitem>
+
+ <listitem>
<para>Yet another way to find a particular port is by using the
Ports Collection's built-in search mechanism. To use the
search feature, you will need to be in the
==== //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/basics/chapter.sgml#7 (text+ko) ====
@@ -1,8 +1,8 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/zh_TW.Big5/books/handbook/basics/chapter.sgml,v 1.6 2008/01/13 15:45:38 chinsan Exp $
- Original revision: 1.149
+ $FreeBSD: doc/zh_TW.Big5/books/handbook/basics/chapter.sgml,v 1.7 2008/01/26 04:04:02 chinsan Exp $
+ Original revision: 1.152
-->
<chapter id="basics">
@@ -132,8 +132,8 @@
FreeBSD ¦b¤¹³\¨Ï¥ÎªÌ°õ¦æµ{¦¡«e±N·|¥ý°Ý³o¨âÓ°ÝÃD¡C</para>
<indexterm><primary>startup scripts</primary></indexterm>
- <para>¦b FreeBSD ¶}¾÷¨Ã¶]§¹°_°Êªº script ¤§«á<footnote>
- <para>³o¨Ç°_°Êªº script ¬O¦b¶}¾÷ªº®ÉÔ FreeBSD ·|¦Û°Ê°õ¦æªºµ{¦¡¡C
+ <para>¦b FreeBSD ¶}¾÷¨Ã¶]§¹±Ò°Êªº script ¤§«á<footnote>
+ <para>³o¨Ç±Ò°Êªº script ¬O¦b¶}¾÷ªº®ÉÔ FreeBSD ·|¦Û°Ê°õ¦æªºµ{¦¡¡C
¥LÌ¥Dnªº¥\¯à¬O±N©Ò¦³¸Ó°õ¦æªºªF¦è³]©w¦n¡A
¨Ã±N±z³]©w¦¨I´º°õ¦æªºªA°È±Ò°Ê¡C</para>
</footnote>¡A¥¦±N·|¦L¥X´£¥Ü¦r¤¸n¨D±z¿é¤J¥¿½Tªº±b¸¹¦WºÙ¡G</para>
@@ -254,6 +254,32 @@
¶}¾÷µ{§Çªº¤H¦Ó¨¥¡A´N·|¬Û·í´Æ¤â¡C</para>
</note>
</sect2>
+
+ <sect2 id="consoles-vidcontrol">
+ <title>§ó§ï console ªºÅã¥Üµe±</title>
+
+ <para>FreeBSD console ¹w³]Åã¥Ü¤j¤p¥i¥H½Õ¾ã¬° 1024x768¡B1280x1024
+ ©Î¨ä¥LÅã¥Ü¥d»P¿Ã¹õ¦³¤ä´©ªº¸ÑªR«×¤j¤p¡C n¤Á´«Åã¥Ü¤j¤p¡A¥²¶·n«·s½sĶ
+ kernel ¨Ã¥[¤J¤U±³o¨â¶µ³]©w¡G</para>
+
+ <programlisting>options VESA
+options SC_PIXEL_MODE</programlisting>
+
+ <para>¤@¥¹ kernel ¦³¥[¤J³o¨â¶µ¨Ã«·s½sĶ§¹²¦¡A´N¥i¥H¥Î &man.vidcontrol.1;
+ ¨Ó°»´ú¥Ø«e©Ò¤ä´©ªº¼Ò¦¡¦³þ¨Ç¡C Yn¬d¬Ý¤ä´©ªº¼Ò¦¡¡A¥i¥H¥´¡G</para>
+
+ <screen>&prompt.root; <userinput>vidcontrol -i mode</userinput></screen>
+
+ <para>¸Ó«ü¥O·|Åã¥Ü¸Ó¾÷¾¹©Ò¤ä´©ªºÅã¥Ü¼Ò¦¡²M³æ¡C µM«á¥i¥H¦b
+ <username>root</username> console ¤º³z¹L &man.vidcontrol.1; «ü¥O¡A
+ ¨Ó§ó§ïÅã¥Ü¼Ò¦¡¡G</para>
+
+ <screen>&prompt.root; <userinput>vidcontrol MODE_279</userinput></screen>
+
+ <para>Y¹ï·sªºÅã¥Ü¼Ò¦¡Ä±±oÁÙ¤£¿ù¡A¥i¥H¦b <filename>/etc/rc.conf</filename>
+ ³]©w¤§¡A¥HÅý¨C¦¸«¶}¾÷«á·|¦Û°Ê¥Í®Ä¡C ¥H¤W±³o±¡ªp¬°¨Ò¡A´N¬O¡G</para>
+
+ <programlisting>allscreens_flags="MODE_279"</programlisting>
</sect1>
<sect1 id="permissions">
@@ -1859,8 +1885,8 @@
<para>Shell ªº¥t¤@¶µ¯SÂI¬O¨Ï¥Î¤FÀô¹ÒÅܼơC
Àô¹ÒÅܼƬO¥HÅܼƻPÁäÈ¡]variable/key¡^ªº¹ïÀ³Ãö«YÀx¦s©ó shell
ªºÀô¹ÒªÅ¶¡¤¤¡A¥ô¦ó¥Ñ shell ©Ò²£¥Íªºµ{§Ç³£¥i¥HŪ¨ú¦¹ªÅ¶¡¡A
- ¦]¦¹³oӪŶ¡Àx¦s¤F³\¦hµ{§Çªº³]©w²ÕºA¡C¦b¦¹ªþ¤W
- ¤@¥÷±`¨£Àô¹ÒÅܼƻP¨ä§t·Nªº¦Cªí¡G</para>
+ ¦]¦¹³oӪŶ¡Àx¦s¤F³\¦hµ{§Çªº³]©w²ÕºA¡C ¦b¦¹ªþ¤W
+ ¤@¥÷±`¨£Àô¹ÒÅܼƻP¨ä²[¸qªº¦Cªí¡G</para>
<indexterm><primary>environment variables</primary></indexterm>
<informaltable frame="none" pgwide="1">
==== //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/ports/chapter.sgml#9 (text+ko) ====
@@ -1,8 +1,8 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/zh_TW.Big5/books/handbook/ports/chapter.sgml,v 1.11 2007/09/16 14:18:29 chinsan Exp $
- Original revision: 1.268
+ $FreeBSD: doc/zh_TW.Big5/books/handbook/ports/chapter.sgml,v 1.12 2008/01/26 16:13:04 chinsan Exp $
+ Original revision: 1.271
-->
<chapter id="ports">
@@ -247,12 +247,11 @@
</listitem>
<listitem>
- <para>Yª¾¹D¸Ó port ªº¥¿½T¦WºÙ¡A¦ý¤£ª¾¹D©ñ¦bþÓ¤ÀÃþ¥Ø¿ý¡A
- ¥i¥H¥Î &man.whereis.1; «ü¥O¨Ó§ä¥X¨Ó¡C
- ¥un¥´ <command>whereis
- <replaceable>file</replaceable></command> §Y¥i¡A¦Ó
- <replaceable>file</replaceable> ªº¦a¤è½Ð§ï¬°·Q¸Ëªº³nÅé¦WºÙ¡C
- Y§ä¨ì¸Ó³nÅé¡A´N·|§i¶D§A¡A´N¹³¤U±³o¼Ë¡G</para>
+ <para>Yª¾¹D¸Ó port ªº¥¿½T¦WºÙ¡A¦ý¤£ª¾¹D©ñ¦bþÓ¤ÀÃþ¥Ø¿ý¡A¥i¥H¥Î
+ &man.whereis.1; «ü¥O¨Ó§ä¥X¨Ó¡C ¥un¥´ <command>whereis
+ <replaceable>file</replaceable></command> §Y¥i¡A¦Ó
+ <replaceable>file</replaceable> ªº¦a¤è½Ð§ï¬°·Q¸Ëªº³nÅé¦WºÙ¡C
+ Y§ä¨ì¸Ó³nÅé¡A´N·|§i¶D§A¡A´N¹³¤U±³o¼Ë¡G</para>
<screen>&prompt.root; <userinput>whereis lsof</userinput>
lsof: /usr/ports/sysutils/lsof</screen>
@@ -261,12 +260,19 @@
<filename>/usr/ports/sysutils/lsof</filename> ¥Ø¿ý¡C</para></listitem>
<listitem>
+ <para>¦¹¥~¡A¤]¥i¥H¥Î &man.echo.1; »´ÃP§ä¥X¸Ó port ¬O¦ì©ó porte tree
+ ªº¦ó³B¡C Á|¨Ò¨Ó»¡¡G</para>
+
+ <screen>&prompt.root; <userinput>echo /usr/ports/*/*lsof*</userinput>
+/usr/ports/sysutils/lsof</screen>
+ </listitem>
+
+ <listitem>
<para>ÁÙ¦³¥t¤@©Û¡A´N¬O¥Î Ports Collection ¥»¨¤º«Øªº·j´M¾÷¨î¡C
- n¥Îªº®ÉÔ¡A½Ð¥ý¤Á´«¨ì <filename>/usr/ports</filename> ¥Ø¿ý¡C
- µM«á¡A¥´ <command>make search
- name=<replaceable>program-name</replaceable></command>¡A¨ä¤¤
- <replaceable>program-name</replaceable> ½Ð§ï¬°·Q§äªº³nÅé¦WºÙ¡C
- Á|¨Ò¨Ó»¡¡AYn§äªº¬O <command>lsof</command> ªº¸Ü¡A¨º»ò´N¬O¡G</para>
+ n¥Îªº®ÉÔ¡A½Ð¥ý¤Á´«¨ì <filename>/usr/ports</filename> ¥Ø¿ý¡C
+ µM«á¡A¥´ <command>make search name=<replaceable>µ{¦¡¦WºÙ</replaceable></command>
+ ¡A¨ä¤¤ <replaceable>µ{¦¡¦WºÙ</replaceable> ½Ð§ï¬°·Q§äªº³nÅé¦WºÙ¡C
+ Á|¨Ò¨Ó»¡¡AYn§äªº¬O <command>lsof</command> ªº¸Ü¡A¨º»ò´N¬O¡G</para>
<screen>&prompt.root; <userinput>cd /usr/ports</userinput>
&prompt.root; <userinput>make search name=lsof</userinput>
@@ -999,6 +1005,21 @@
<makevar>PREFIX</makevar> ¬O¬Û·í§xÃø¡A¬Æ¦Ü¬O¤£¥i¯àªº¨Æ¡C</para>
</sect3>
+
+ <sect3>
+ <title>«·s³]©w Ports ¿ï¶µ</title>
+
+ <para>¦b½sĶ¬Y¨Ç port ®É·|¥X²{¿ï³æµe±(ncurses-based)¡A
+ ¥i¥H¥Î¨Ó¿ï¾Ü¦w¸Ë¿ï¶µ¡C ³q±`¸Ë¦n¸Ó port ¤§«á¡A«K¤£¤Ó·|»Ýn«¥[¡B
+ ²¾°£¡B§ó§ï¤@¨Ç·íªì¦w¸Ëªº¿ï¶µ¡C ¦ý¤é«áY¦³»Ýnªº¸Ü¡A
+ ¤]¦³³\¦h¤è¦¡¥i¥H½Õ¾ã³o¨Ç¿ï¶µ¡C ¨ä¤¤¤@ºØ¤è¦¡«K¬O¤Á¨ì¸Ó port ¥Ø¿ý¡A
+ ¨Ã¥´ <command>make</command> <maketarget>config</maketarget>
+ §Y¥i¦A¦¸¦^¨ì¿ï¶µµe±¥h§@½Õ¾ã¡C ¥t¥~ÁÙ¥i¥Î <command>make</command>
+ <maketarget>showconfig</maketarget> ¥HÅã¥Ü¸Ó port ¦w¸Ë®É©Ò¥Îªº¿ï¶µ¡C
+ ¤]¥i¥H¥Î <command>make</command> <maketarget>rmconfig</maketarget>
+ ¨Ó§â©Ò¦³¿ï¶µ¦^¨ìªì©l³]©w¡C ³o¨Ç¿ï¶µ¸ò¨ä¥L°Ê§@³£¥i°Ñ¾\ &man.ports.7;
+ ¤ºªº¸Ô²Ó»¡©ú¡C</para>
+ </sect3>
</sect2>
<sect2 id="ports-removing">
==== //depot/projects/dtrace/ports/UPDATING#49 (text+ko) ====
@@ -6,6 +6,16 @@
time you update your ports collection, before attempting any port
upgrades.
+20080126:
+ AFFECTS: users of net-p2p/deluge
+ AUTHOR: mezz at FreeBSD.org
+
+ Update of deluge to 0.5.8.2, if you are using blocklist plugin. You have
+ to remove blocklist.conf first before you can run it or it will crash in
+ the start up.
+
+ $ rm -f ~/.config/deluge/blocklist.conf
+
20080125:
AFFECTS: users of www/mod_security2
AUTHOR: araujo at FreeBSD.org
@@ -6015,4 +6025,4 @@
2) Update all p5-* modules.
portupgrade -f p5-\*
-$FreeBSD: ports/UPDATING,v 1.579 2008/01/25 11:31:31 araujo Exp $
+$FreeBSD: ports/UPDATING,v 1.580 2008/01/26 16:44:43 mezz Exp $
==== //depot/projects/dtrace/src/ObsoleteFiles.inc#36 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.126 2008/01/22 20:08:09 attilio Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.127 2008/01/26 20:23:25 brueffer Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,9 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20080126: oldcard.4 removal
+OLD_FILES+=usr/share/man/man4/card.4.gz
+OLD_FILES+=usr/share/man/man4/oldcard.4.gz
# 20080122: Removed from the tree
OLD_FILES+=usr/share/man/man9/BUF_REFCNT.9.gz
# 20080108: Moved to section 2
==== //depot/projects/dtrace/src/UPDATING#23 (text+ko) ====
@@ -22,6 +22,20 @@
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20080126:
+ The fts(3) structures have been changed to use adequate
+ integer types for their members and so to be able to cope
+ with huge file trees. The old fts(3) ABI is preserved
+ through symbol versioning in libc, so third-party binaries
+ using fts(3) should still work, although they will not take
+ advantage of the extended types. At the same time, some
+ third-party software might fail to build after this change
+ due to unportable assumptions made in its source code about
+ fts(3) structure members. Such software should be fixed
+ by its vendor or, in the worst case, in the ports tree.
+ FreeBSD_version 800015 marks this change for the unlikely
+ case that a portable fix is impossible.
+
20080123:
To upgrade to -current after this date, you must be running
FreeBSD not older than 6.0-RELEASE. Upgrading to -current
@@ -955,4 +969,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.516 2008/01/23 22:21:36 ru Exp $
+$FreeBSD: src/UPDATING,v 1.517 2008/01/26 17:09:39 yar Exp $
==== //depot/projects/dtrace/src/etc/devd.conf#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.38 2007/06/21 22:50:36 njl Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.39 2008/01/26 13:50:38 mtm Exp $
#
# Refer to devd.conf(5) and devd(8) man pages for the details on how to
# run and configure devd.
@@ -53,7 +53,7 @@
match "system" "IFNET";
match "type" "LINK_UP";
media-type "ethernet";
- action "/etc/rc.d/dhclient start $subsystem";
+ action "/etc/rc.d/dhclient quietstart $subsystem";
};
#
@@ -73,7 +73,7 @@
match "system" "IFNET";
match "type" "LINK_UP";
media-type "802.11";
- action "/etc/rc.d/dhclient start $subsystem";
+ action "/etc/rc.d/dhclient quietstart $subsystem";
};
# An entry like this might be in a different file, but is included here
@@ -91,11 +91,11 @@
# When a USB Bluetooth dongle appears activate it
attach 100 {
device-name "ubt[0-9]+";
- action "/etc/rc.d/bluetooth start $device-name";
+ action "/etc/rc.d/bluetooth quietstart $device-name";
};
detach 100 {
device-name "ubt[0-9]+";
- action "/etc/rc.d/bluetooth stop $device-name";
+ action "/etc/rc.d/bluetooth quietstop $device-name";
};
# When a USB keyboard arrives, attach it as the console keyboard.
@@ -112,7 +112,7 @@
# stops automatically (actually it bombs :) when the device disappears.
attach 100 {
device-name "ums[0-9]+";
- action "/etc/rc.d/moused start $device-name";
+ action "/etc/rc.d/moused quietstart $device-name";
};
# Firmware download into the ActiveWire board. After the firmware download is
==== //depot/projects/dtrace/src/etc/netstart#4 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/netstart,v 1.67 2006/05/30 02:10:01 brooks Exp $
+# $FreeBSD: src/etc/netstart,v 1.68 2008/01/26 13:37:48 mtm Exp $
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
#
@@ -37,29 +37,31 @@
. /etc/rc.subr
load_rc_config 'XXX'
-/etc/rc.d/devd start
-/etc/rc.d/hostname start
-/etc/rc.d/ipmon start
-/etc/rc.d/ipfilter start
-/etc/rc.d/ipnat start
-/etc/rc.d/ipfs start
-/etc/rc.d/sppp start
-# /etc/rc.d/atm1 start
-# . /etc/rc.d/atm2.sh start
-# . /etc/rc.d/atm3.sh start
-/etc/rc.d/netif start
-/etc/rc.d/ipsec start
-/etc/rc.d/dhclient start
-/etc/rc.d/isdnd start
-/etc/rc.d/ppp start
-/etc/rc.d/ipfw start
-/etc/rc.d/ip6fw start
-/etc/rc.d/network_ipv6 start
-/etc/rc.d/routing start
-/etc/rc.d/mroute6d start
-/etc/rc.d/route6d start
-/etc/rc.d/mrouted start
-/etc/rc.d/routed start
-/etc/rc.d/nisdomain start
+_start=quietstart
+
+/etc/rc.d/devd ${_start}
+/etc/rc.d/hostname ${_start}
+/etc/rc.d/ipmon ${_start}
+/etc/rc.d/ipfilter ${_start}
+/etc/rc.d/ipnat ${_start}
+/etc/rc.d/ipfs ${_start}
+/etc/rc.d/sppp ${_start}
+# /etc/rc.d/atm1 ${_start}
+# . /etc/rc.d/atm2.sh ${_start}
+# . /etc/rc.d/atm3.sh ${_start}
+/etc/rc.d/netif ${_start}
+/etc/rc.d/ipsec ${_start}
+/etc/rc.d/dhclient ${_start}
+/etc/rc.d/isdnd ${_start}
+/etc/rc.d/ppp ${_start}
+/etc/rc.d/ipfw ${_start}
+/etc/rc.d/ip6fw ${_start}
+/etc/rc.d/network_ipv6 ${_start}
+/etc/rc.d/routing ${_start}
+/etc/rc.d/mroute6d ${_start}
+/etc/rc.d/route6d ${_start}
+/etc/rc.d/mrouted ${_start}
+/etc/rc.d/routed ${_start}
+/etc/rc.d/nisdomain ${_start}
exit 0
==== //depot/projects/dtrace/src/etc/rc#5 (text+ko) ====
@@ -25,7 +25,7 @@
# SUCH DAMAGE.
#
# @(#)rc 5.27 (Berkeley) 6/5/91
-# $FreeBSD: src/etc/rc,v 1.340 2007/04/02 22:53:06 des Exp $
+# $FreeBSD: src/etc/rc,v 1.341 2008/01/26 11:22:11 mtm Exp $
#
# System startup script run by init on autoboot
@@ -56,7 +56,7 @@
rc_fast=yes # run_rc_command(): do fast booting
else
autoboot=no
- _boot="start"
+ _boot="quietstart"
fi
dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null`
==== //depot/projects/dtrace/src/etc/rc.d/ipfw#7 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ipfw,v 1.15 2007/04/02 15:38:53 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ipfw,v 1.16 2008/01/26 14:02:19 mtm Exp $
#
# PROVIDE: ipfw
@@ -24,7 +24,7 @@
if [ -r "${firewall_script}" ]; then
if [ -f /etc/rc.d/natd ] ; then
- /etc/rc.d/natd start
+ /etc/rc.d/natd quietstart
fi
/bin/sh "${firewall_script}"
echo 'Firewall rules loaded.'
@@ -52,7 +52,7 @@
#
${SYSCTL_W} net.inet.ip.fw.enable=0
if [ -f /etc/rc.d/natd ] ; then
- /etc/rc.d/natd stop
+ /etc/rc.d/natd quietstop
fi
}
==== //depot/projects/dtrace/src/etc/rc.d/mountcritremote#7 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.17 2007/12/08 07:20:22 dougb Exp $
+# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.18 2008/01/26 14:02:19 mtm Exp $
#
# PROVIDE: mountcritremote
@@ -65,7 +65,7 @@
done
# Cleanup /var again just in case it's a network mount.
- /etc/rc.d/cleanvar reload
+ /etc/rc.d/cleanvar quietreload
rm -f /var/run/clean_var /var/spool/lock/clean_var
}
==== //depot/projects/dtrace/src/etc/rc.d/netif#6 (text+ko) ====
@@ -22,7 +22,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/netif,v 1.24 2007/07/25 18:08:01 jhb Exp $
+# $FreeBSD: src/etc/rc.d/netif,v 1.25 2008/01/26 11:22:12 mtm Exp $
#
# PROVIDE: netif
@@ -72,7 +72,7 @@
if [ -f /etc/rc.d/ipfilter ] ; then
# Resync ipfilter
- /etc/rc.d/ipfilter resync
+ /etc/rc.d/ipfilter quietresync
fi
if [ -f /etc/rc.d/bridge -a -n "$cmdifn" ] ; then
/etc/rc.d/bridge start $cmdifn
==== //depot/projects/dtrace/src/etc/rc.d/ppp#8 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ppp,v 1.15 2007/10/18 17:10:40 emax Exp $
+# $FreeBSD: src/etc/rc.d/ppp,v 1.16 2008/01/26 14:02:19 mtm Exp $
#
# PROVIDE: ppp
@@ -82,8 +82,8 @@
{
# Re-Sync ipfilter and pf so they pick up any new network interfaces
#
- /etc/rc.d/ipfilter resync
- /etc/rc.d/pf resync
+ /etc/rc.d/ipfilter quietresync
+ /etc/rc.d/pf quietresync
}
ppp_stop_profile() {
==== //depot/projects/dtrace/src/etc/rc.subr#16 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $
-# $FreeBSD: src/etc/rc.subr,v 1.79 2008/01/25 16:44:34 mtm Exp $
+# $FreeBSD: src/etc/rc.subr,v 1.80 2008/01/26 11:22:11 mtm Exp $
#
# Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -377,9 +377,10 @@
# If argument has a given prefix, then change the operation as follows:
# Prefix Operation
# ------ ---------
-# fast Skip the pid check, and set rc_fast=yes
+# fast Skip the pid check, and set rc_fast=yes, rc_quiet=yes
# force Set ${rcvar} to YES, and set rc_force=yes
# one Set ${rcvar} to YES
+# quiet Don't output some diagnostics, and set rc_quiet=yes
#
# The following globals are used:
#
@@ -522,6 +523,8 @@
#
# rc_force Not empty if "force" was provided (q.v.)
#
+# rc_quiet Not empty if "quiet" was provided
+#
#
run_rc_command()
{
@@ -542,6 +545,7 @@
fast*) # "fast" prefix; don't check pid
rc_arg=${rc_arg#fast}
rc_fast=yes
+ rc_quiet=yes
;;
force*) # "force prefix; always run
rc_force=yes
@@ -558,6 +562,11 @@
eval ${rcvar}=YES
fi
;;
+ quiet*) # "quiet" prefix; omit some messages
+ _rc_prefix=quiet
+ rc_arg=${rc_arg#${_rc_prefix}}
+ rc_quiet=yes
+ ;;
esac
eval _override_command=\$${name}_program
@@ -606,6 +615,12 @@
#
if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" ]; then
if ! checkyesno ${rcvar}; then
+ if [ -n "${rc_quiet}" ]; then
+ return 0
+ fi
+ echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to "
+ echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' "
+ echo "instead of '${rc_arg}'."
return 0
fi
fi
==== //depot/projects/dtrace/src/include/fts.h#4 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)fts.h 8.3 (Berkeley) 8/14/94
- * $FreeBSD: src/include/fts.h,v 1.11 2005/01/07 00:06:20 pjd Exp $
+ * $FreeBSD: src/include/fts.h,v 1.12 2008/01/26 17:09:40 yar Exp $
*/
#ifndef _FTS_H_
@@ -44,8 +44,8 @@
dev_t fts_dev; /* starting device # */
char *fts_path; /* path for this descent */
int fts_rfd; /* fd for root */
- int fts_pathlen; /* sizeof(path) */
- int fts_nitems; /* elements in the sort array */
+ size_t fts_pathlen; /* sizeof(path) */
+ size_t fts_nitems; /* elements in the sort array */
int (*fts_compar) /* compare function */
(const struct _ftsent * const *, const struct _ftsent * const *);
@@ -69,22 +69,15 @@
struct _ftsent *fts_cycle; /* cycle node */
struct _ftsent *fts_parent; /* parent directory */
struct _ftsent *fts_link; /* next file in directory */
- union {
- struct {
- long __fts_number; /* local numeric value */
- void *__fts_pointer; /* local address value */
- } __struct_ftsent;
- int64_t __fts_bignum;
- } __union_ftsent;
-#define fts_number __union_ftsent.__struct_ftsent.__fts_number
-#define fts_pointer __union_ftsent.__struct_ftsent.__fts_pointer
-#define fts_bignum __union_ftsent.__fts_bignum
+ long long fts_number; /* local numeric value */
+#define fts_bignum fts_number /* XXX non-std, should go away */
+ void *fts_pointer; /* local address value */
char *fts_accpath; /* access path */
char *fts_path; /* root path */
int fts_errno; /* errno for this node */
int fts_symfd; /* fd for symlink */
- u_short fts_pathlen; /* strlen(fts_path) */
- u_short fts_namelen; /* strlen(fts_name) */
+ size_t fts_pathlen; /* strlen(fts_path) */
+ size_t fts_namelen; /* strlen(fts_name) */
ino_t fts_ino; /* inode */
dev_t fts_dev; /* device */
@@ -92,7 +85,7 @@
#define FTS_ROOTPARENTLEVEL -1
#define FTS_ROOTLEVEL 0
- short fts_level; /* depth (-1 to N) */
+ long fts_level; /* depth (-1 to N) */
#define FTS_D 1 /* preorder directory */
#define FTS_DC 2 /* directory that causes cycles */
@@ -108,18 +101,18 @@
#define FTS_SL 12 /* symbolic link */
#define FTS_SLNONE 13 /* symbolic link without target */
#define FTS_W 14 /* whiteout object */
- u_short fts_info; /* user flags for FTSENT structure */
+ int fts_info; /* user status for FTSENT structure */
#define FTS_DONTCHDIR 0x01 /* don't chdir .. to the parent */
#define FTS_SYMFOLLOW 0x02 /* followed a symlink to get here */
#define FTS_ISW 0x04 /* this is a whiteout object */
- u_short fts_flags; /* private flags for FTSENT structure */
+ unsigned fts_flags; /* private flags for FTSENT structure */
#define FTS_AGAIN 1 /* read node again */
#define FTS_FOLLOW 2 /* follow symbolic link */
#define FTS_NOINSTR 3 /* no instructions */
#define FTS_SKIP 4 /* discard node */
- u_short fts_instr; /* fts_set() instructions */
+ int fts_instr; /* fts_set() instructions */
struct stat *fts_statp; /* stat(2) information */
char *fts_name; /* file name */
==== //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#12 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.130 2008/01/10 22:11:21 jhb Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.131 2008/01/26 17:09:40 yar Exp $
# machine-independent gen sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -11,7 +11,7 @@
crypt.c ctermid.c daemon.c devname.c dirname.c disklabel.c \
dlfcn.c dlfunc.c drand48.c erand48.c err.c errlst.c errno.c \
exec.c feature_present.c fmtcheck.c fmtmsg.c fnmatch.c \
- fpclassify.c frexp.c fstab.c ftok.c fts.c ftw.c \
+ fpclassify.c frexp.c fstab.c ftok.c fts.c fts-compat.c ftw.c \
getbootfile.c getbsize.c \
getcap.c getcwd.c getdomainname.c getgrent.c getgrouplist.c \
gethostname.c getloadavg.c getlogin.c getmntinfo.c getnetgrent.c \
==== //depot/projects/dtrace/src/lib/libc/gen/Symbol.map#5 (text) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.7 2007/11/27 16:22:21 jasone Exp $
+ * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.8 2008/01/26 17:09:40 yar Exp $
*/
FBSD_1.0 {
@@ -134,14 +134,6 @@
setfsent;
endfsent;
ftok;
- fts_open;
- fts_close;
- fts_read;
- fts_set;
- fts_children;
- fts_get_clientptr;
- fts_get_stream;
- fts_set_clientptr;
ftw;
glob;
globfree;
@@ -336,6 +328,17 @@
wordfree;
};
+FBSD_1.1 {
+ fts_open;
+ fts_close;
+ fts_read;
+ fts_set;
+ fts_children;
+ fts_get_clientptr;
+ fts_get_stream;
+ fts_set_clientptr;
+};
+
FBSDprivate_1.0 {
/* needed by thread libraries */
__thr_jtable;
==== //depot/projects/dtrace/src/lib/libc/gen/fts-compat.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/fts-compat.c,v 1.29 2007/08/23 05:09:31 yar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fts-compat.c,v 1.30 2008/01/26 17:09:40 yar Exp $");
#include "namespace.h"
#include <sys/param.h>
@@ -46,12 +46,22 @@
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
-#include <fts.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include "fts-compat.h"
#include "un-namespace.h"
+FTSENT *__fts_children_44bsd(FTS *, int);
+int __fts_close_44bsd(FTS *);
+void *__fts_get_clientptr_44bsd(FTS *);
+FTS *__fts_get_stream_44bsd(FTSENT *);
+FTS *__fts_open_44bsd(char * const *, int,
+ int (*)(const FTSENT * const *, const FTSENT * const *));
+FTSENT *__fts_read_44bsd(FTS *);
+int __fts_set_44bsd(FTS *, FTSENT *, int);
+void __fts_set_clientptr_44bsd(FTS *, void *);
+
static FTSENT *fts_alloc(FTS *, char *, int);
static FTSENT *fts_build(FTS *, int);
static void fts_lfree(FTSENT *);
@@ -107,7 +117,7 @@
};
FTS *
-fts_open(argv, options, compar)
+__fts_open_44bsd(argv, options, compar)
char * const *argv;
int options;
int (*compar)(const FTSENT * const *, const FTSENT * const *);
@@ -246,7 +256,7 @@
}
int
-fts_close(sp)
+__fts_close_44bsd(sp)
FTS *sp;
{
FTSENT *freep, *p;
@@ -301,7 +311,7 @@
? p->fts_pathlen - 1 : p->fts_pathlen)
FTSENT *
-fts_read(sp)
+__fts_read_44bsd(sp)
FTS *sp;
{
FTSENT *p, *tmp;
@@ -495,7 +505,7 @@
*/
/* ARGSUSED */
int
-fts_set(sp, p, instr)
+__fts_set_44bsd(sp, p, instr)
FTS *sp;
FTSENT *p;
int instr;
@@ -510,7 +520,7 @@
}
FTSENT *
-fts_children(sp, instr)
+__fts_children_44bsd(sp, instr)
FTS *sp;
int instr;
{
@@ -582,7 +592,7 @@
#endif
void *
-(fts_get_clientptr)(FTS *sp)
+(__fts_get_clientptr_44bsd)(FTS *sp)
{
return (fts_get_clientptr(sp));
@@ -593,13 +603,13 @@
#endif
FTS *
-(fts_get_stream)(FTSENT *p)
+(__fts_get_stream_44bsd)(FTSENT *p)
{
return (fts_get_stream(p));
}
void
-fts_set_clientptr(FTS *sp, void *clientptr)
+__fts_set_clientptr_44bsd(FTS *sp, void *clientptr)
{
sp->fts_clientptr = clientptr;
@@ -1220,3 +1230,12 @@
}
return (priv->ftsp_linksreliable);
}
+
+__sym_compat(fts_open, __fts_open_44bsd, FBSD_1.0);
+__sym_compat(fts_close, __fts_close_44bsd, FBSD_1.0);
+__sym_compat(fts_read, __fts_read_44bsd, FBSD_1.0);
+__sym_compat(fts_set, __fts_set_44bsd, FBSD_1.0);
+__sym_compat(fts_children, __fts_children_44bsd, FBSD_1.0);
+__sym_compat(fts_get_clientptr, __fts_get_clientptr_44bsd, FBSD_1.0);
+__sym_compat(fts_get_stream, __fts_get_stream_44bsd, FBSD_1.0);
+__sym_compat(fts_set_clientptr, __fts_set_clientptr_44bsd, FBSD_1.0);
==== //depot/projects/dtrace/src/lib/libc/gen/fts-compat.h#2 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)fts.h 8.3 (Berkeley) 8/14/94
- * $FreeBSD: src/lib/libc/gen/fts-compat.h,v 1.12 2007/08/23 05:09:31 yar Exp $
+ * $FreeBSD: src/lib/libc/gen/fts-compat.h,v 1.13 2008/01/26 17:09:40 yar Exp $
*/
#ifndef _FTS_H_
@@ -126,20 +126,7 @@
FTS *fts_fts; /* back pointer to main FTS */
} FTSENT;
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-FTSENT *fts_children(FTS *, int);
-int fts_close(FTS *);
-void *fts_get_clientptr(FTS *);
#define fts_get_clientptr(fts) ((fts)->fts_clientptr)
-FTS *fts_get_stream(FTSENT *);
#define fts_get_stream(ftsent) ((ftsent)->fts_fts)
-FTS *fts_open(char * const *, int,
- int (*)(const FTSENT * const *, const FTSENT * const *));
-FTSENT *fts_read(FTS *);
-int fts_set(FTS *, FTSENT *, int);
-void fts_set_clientptr(FTS *, void *);
-__END_DECLS
#endif /* !_FTS_H_ */
==== //depot/projects/dtrace/src/lib/libc/gen/fts.3#5 (text+ko) ====
@@ -26,9 +26,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)fts.3 8.5 (Berkeley) 4/16/94
-.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.23 2007/01/09 00:27:53 imp Exp $
+.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.24 2008/01/26 17:09:40 yar Exp $
.\"
-.Dd January 7, 2005
+.Dd January 26, 2008
.Dt FTS 3
.Os
.Sh NAME
@@ -133,17 +133,16 @@
described in greater detail below:
.Bd -literal
typedef struct _ftsent {
- u_short fts_info; /* flags for FTSENT structure */
+ int fts_info; /* status for FTSENT structure */
char *fts_accpath; /* access path */
char *fts_path; /* root path */
- u_short fts_pathlen; /* strlen(fts_path) */
+ size_t fts_pathlen; /* strlen(fts_path) */
char *fts_name; /* file name */
- u_short fts_namelen; /* strlen(fts_name) */
- short fts_level; /* depth (\-1 to N) */
+ size_t fts_namelen; /* strlen(fts_name) */
+ long fts_level; /* depth (\-1 to N) */
int fts_errno; /* file errno */
- long fts_number; /* local numeric value */
+ long long fts_number; /* local numeric value */
void *fts_pointer; /* local address value */
- int64_t fts_bignum; /* local 64-bit numeric value */
struct ftsent *fts_parent; /* parent directory */
struct ftsent *fts_link; /* next file structure */
struct ftsent *fts_cycle; /* cycle structure */
@@ -292,8 +291,6 @@
.Nm
functions.
It is initialized to 0.
-Note that this field is overlaid by
-.Fa fts_bignum .
.It Fa fts_pointer
This field is provided for the use of the application program and is
not modified by the
@@ -301,18 +298,6 @@
functions.
It is initialized to
.Dv NULL .
-Note that this field is overlaid by
-.Fa fts_bignum .
-.It Fa fts_bignum
-This field is provided for the use of the application program and is
-not modified by the
-.Nm
-functions.
-It is initialized to 0.
-Note that this field overlays
-.Fa fts_number
-and
-.Fa fts_pointer .
.It Fa fts_parent
A pointer to the
.Vt FTSENT
==== //depot/projects/dtrace/src/lib/libc/gen/fts.c#5 (text+ko) ====
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list