PERFORCE change 84640 for review
Alan Cox
alc at FreeBSD.org
Sat Oct 1 21:34:33 PDT 2005
http://perforce.freebsd.org/chv.cgi?CH=84640
Change 84640 by alc at alc_home on 2005/10/02 04:34:26
IFC @84637
Affected files ...
.. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#2 integrate
.. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#2 integrate
.. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#2 integrate
.. //depot/projects/superpages/src/UPDATING#2 integrate
.. //depot/projects/superpages/src/etc/rc.subr#2 integrate
.. //depot/projects/superpages/src/sys/dev/wi/if_wi.c#2 integrate
Differences ...
==== //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#2 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.457 2005/09/30 17:19:53 garga Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.458 2005/10/02 01:56:13 jylefort Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -3687,6 +3687,11 @@
</listitem>
<listitem>
+ <para>Jason E. Hale
+ <email>jhale at bluebottle.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Jason Garman
<email>init at risen.org</email></para>
</listitem>
==== //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#2 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml,v 1.60 2005/09/12 15:14:54 garys Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml,v 1.61 2005/10/01 21:54:12 garys Exp $
-->
<chapter id="boot">
@@ -71,32 +71,47 @@
load the operating system, which has become shortened to
<quote>booting</quote>.</para>
+ <indexterm><primary>BIOS</primary></indexterm>
+
+ <indexterm><primary>Basic Input/Output System</primary><see>BIOS</see></indexterm>
+
<para>On x86 hardware the Basic Input/Output System (BIOS) is responsible
for loading the operating system. To do this, the BIOS looks on the
hard disk for the Master Boot Record (MBR), which must be located on a
specific place on the disk. The BIOS has enough knowledge to load and
run the MBR, and assumes that the MBR can then carry out the rest of the
- tasks involved in loading the operating system.</para>
+ tasks involved in loading the operating system,
+ possibly with the help of the BIOS.</para>
+
+ <indexterm><primary>Master Boot Record (MBR)</primary></indexterm>
+
+ <indexterm><primary>Boot Manager</primary></indexterm>
- <indexterm>
- <primary>BIOS</primary>
- </indexterm>
+ <indexterm><primary>Boot Loader</primary></indexterm>
- <indexterm>
- <primary>Basic Input/Output System</primary>
- <see>BIOS</see>
- </indexterm>
+ <para>The code within the MBR is usually referred to as a <emphasis>boot
+ manager</emphasis>, especially when it interacts with the user. In this case
+ the boot manager usually has more code in the first
+ <emphasis>track</emphasis> of the disk or within some OS's file system. (A
+ boot manager is sometimes also called a <emphasis>boot loader</emphasis>,
+ but FreeBSD uses that term for a later stage of booting.) Popular boot
+ managers include <application>boot0</application> (a.k.a. <application>Boot
+ Easy</application>, the standard &os; boot manager),
+ <application>Grub</application>, <application>GAG</application>, and
+ <application>LILO</application>.
+ (Only <application>boot0</application> fits within the MBR.)</para>
- <para>If you only have one operating system installed on your disks then
- the standard MBR will suffice. This MBR searches for the first bootable
- slice on the disk, and then runs the code on that slice to load the
- remainder of the operating system.</para>
+ <para>If you have only one operating system installed on your disks then
+ a standard PC MBR will suffice. This MBR searches for the first bootable
+ (a.k.a. active) slice on the disk, and then runs the code on that slice to
+ load the remainder of the operating system. The MBR installed by
+ &man.fdisk.8;, by default, is such an MBR. It is based on
+ <filename>/boot/mbr</filename>.</para>
<para>If you have installed multiple operating systems on your disks then
- you can install a different MBR, one that can display a list of
+ you can install a different boot manager, one that can display a list of
different operating systems, and allows you to choose the one to boot
- from. FreeBSD comes with one such MBR which can be installed, and other
- operating system vendors also provide alternative MBRs.</para>
+ from. Two of these are discussed in the next subsection.</para>
<para>The remainder of the FreeBSD bootstrap system is divided into three
stages. The first stage is run by the MBR, which knows just enough to
@@ -122,28 +137,28 @@
</sect1>
<sect1 id="boot-blocks">
- <title>The MBR, and Boot Stages One, Two, and Three</title>
+ <title>The Boot Manager and Boot Stages</title>
+
+ <indexterm><primary>Boot Manager</primary></indexterm>
<sect2 id="boot-boot0">
- <title>MBR, <filename>/boot/boot0</filename></title>
+ <title>The Boot Manager</title>
<indexterm><primary>Master Boot Record (MBR)</primary></indexterm>
- <para>The MBR installed by FreeBSD's installer and by boot0cfg(8)
- are based on <filename>/boot/boot0</filename>. The MBR is the first
- sector of a disk, outside slices. (The MBR installed by fdisk(8),
- by default, is based on <filename>/boot/mbr</filename>; it is
- similar to the PC-DOS MBR and it boots the slice marked
- <emphasis>active</emphasis> without prompting the user as the
- FreeBSD MBR does.)
+ <para>The code in the MBR or boot manager is sometimes referred to as
+ <emphasis>stage zero</emphasis> of the boot process. This subsection
+ discusses two of the boot managers previously mentioned:
+ <application>boot0</application> and <application>LILO</application>.</para>
- <para><filename>boot0</filename> is very simple, since the
- program in the <abbrev>MBR</abbrev> can only be 512 bytes in
- size.
- (Actually, it can only be 446 bytes because of the slice
- table and the 0x55AA identifier at the end of the MBR).
- If you have installed the FreeBSD MBR and have installed
- multiple operating systems on your hard disks then you will see a
- display similar to this one at boot time:</para>
+ <formalpara><title>The <application>boot0</application> Boot Manager:</title>
+ <para>The MBR installed by FreeBSD's installer or &man.boot0cfg.8;, by
+ default, is based on <filename>/boot/boot0</filename>.
+ (The <application>boot0</application> program is very simple, since the
+ program in the <abbrev>MBR</abbrev> can only be 446 bytes long because of the slice
+ table and 0x55AA identifier at the end of the MBR.)
+ If you have installed <application>boot0</application> and
+ multiple operating systems on your hard disks, then you will see a
+ display similar to this one at boot time:</para></formalpara>
<example id="boot-boot0-example">
<title><filename>boot0</filename> Screenshot</title>
@@ -164,38 +179,34 @@
<screen>&prompt.root; <userinput>fdisk -B -b /boot/boot0 <replaceable>device</replaceable></userinput></screen>
- <para>Where <replaceable>device</replaceable> is the device that you
+ <para>where <replaceable>device</replaceable> is the device that you
boot from, such as <devicename>ad0</devicename> for the first IDE
disk, <devicename>ad2</devicename> for the first IDE disk on a second
IDE controller, <devicename>da0</devicename> for the first SCSI disk,
- and so on.</para>
+ and so on. Or, if you want a custom configuration of the MBR,
+ use &man.boot0cfg.8;.</para>
+
+ <formalpara><title>The LILO Boot Manager:</title>
- <para>If you are a Linux user, however, and prefer that
- <application>LILO</application> control the boot process, you can
- edit the <filename>/etc/lilo.conf</filename> file for FreeBSD, or
- select <option>Leave The Master Boot Record Untouched</option>
- during the FreeBSD installation process. If you have installed the
- FreeBSD boot manager, you can boot back into Linux and modify the
- <application>LILO</application> configuration file
- <filename>/etc/lilo.conf</filename> and add the following
- option:</para>
+ <para>To install this boot manager so it will also boot FreeBSD, first
+ start Linux and add the following to your existing
+ <filename>/etc/lilo.conf</filename> configuration file:</para>
<programlisting>other=/dev/hdXY
-table=/dev/hdb
+table=/dev/hdX
loader=/boot/chain.b
label=FreeBSD</programlisting>
- <para>which will permit the booting of FreeBSD and Linux via
- <application>LILO</application>. In our example, we use
- <replaceable>XY</replaceable> to determine drive number and
- partition. If you are using a <acronym>SCSI</acronym> drive, you
- will want to change <replaceable>/dev/hdXY</replaceable> to read
- something similar to <replaceable>/dev/sdXY</replaceable>, which
- again uses the <replaceable>XY</replaceable> syntax. The
- <option>loader=/boot/chain.b</option> can be omitted if you have
- both operating systems on the same drive. You can now run
- <command>/sbin/lilo -v</command> to commit your new changes to the
- system, this should be verified with screen messages.</para>
+ <para>In the above, specify FreeBSD's primary partition and drive using
+ Linux specifiers, replacing <replaceable>X</replaceable> with the Linux
+ drive letter and <replaceable>Y</replaceable> with the Linux primary
+ partition number. If you are using a <acronym>SCSI</acronym> drive, you
+ will need to change <replaceable>/dev/hd</replaceable> to read something
+ similar to <replaceable>/dev/sd</replaceable>. The
+ <option>loader=/boot/chain.b</option> line can be omitted if you have
+ both operating systems on the same drive. Now run
+ <command>/sbin/lilo -v</command> to commit your new changes to the
+ system; this should be verified by checking its screen messages.</para>
</sect2>
<sect2 id="boot-boot1">
@@ -205,17 +216,18 @@
<para>Conceptually the first and second stages are part of the same
program, on the same area of the disk. Because of space constraints
they have been split into two, but you would always install them
- together.</para>
+ together. They are copied from the combined file
+ <filename>/boot/boot</filename> by the installer or
+ <application>disklabel</application> (see below).</para>
- <para>They are found on the boot sector of
- the boot slice, which is where <link
- linkend="boot-boot0">boot0</link>, or any other program on the
- <abbrev>MBR</abbrev> expects to find the program to run to
- continue the boot process. The files in the
- <filename>/boot</filename> directory are copies of the real files,
- which are stored outside of the FreeBSD file system.</para>
+ <para>They are located outside file systems, in the first track of
+ the boot slice, starting with the first sector. This is where <link
+ linkend="boot-boot0">boot0</link>, or any other boot manager,
+ expects to find a program to run which will
+ continue the boot process. The number of sectors used is easily
+ determined from the size of <filename>/boot/boot</filename>.</para>
- <para><filename>boot1</filename> is very simple, since it too
+ <para><filename>boot1</filename> is very simple, since it
can only be 512 bytes
in size, and knows just enough about the FreeBSD
<firstterm>disklabel</firstterm>, which stores information
==== //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#2 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v 1.281 2005/07/26 16:07:39 trhodes Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v 1.282 2005/10/01 22:40:29 garys Exp $
-->
<chapter id="security">
@@ -863,8 +863,6 @@
(except for certain specific Internet-accessible ports, of
course).</para>
- <indexterm><primary>ICMP_BANDLIM</primary></indexterm>
-
<para>Another common DoS attack is called a springboard attack
— to attack a server in a manner that causes the server to
generate responses which overloads the server, the local
@@ -885,10 +883,13 @@
server to saturate its outgoing network with ICMP responses. This
type of attack can also crash the server by running it out of
mbuf's, especially if the server cannot drain the ICMP responses
- it generates fast enough. The &os; kernel has a new kernel
+ it generates fast enough. &os; 4.X kernels have a kernel
compile option called <option>ICMP_BANDLIM</option>
which limits the effectiveness
- of these sorts of attacks. The last major class of springboard
+ of these sorts of attacks.
+ Later kernels use the <application>sysctl</application>
+ variable <literal>net.inet.icmp.icmplim</literal>.
+ The last major class of springboard
attacks is related to certain internal
<application>inetd</application> services such as the
udp echo service. An attacker simply spoofs a UDP packet with the
==== //depot/projects/superpages/src/UPDATING#2 (text+ko) ====
@@ -21,6 +21,10 @@
developers choose to disable these features on build machines
to maximize performance.
+20051001:
+ kern.polling.enable sysctl MIB is now deprecated. Use ifconfig(8)
+ to turn polling(4) on your interfaces.
+
20050927:
The old bridge(4) implementation was retired. The new
if_bridge(4) serves as a full functional replacement.
@@ -415,4 +419,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.421 2005/09/27 18:10:29 mlaier Exp $
+$FreeBSD: src/UPDATING,v 1.422 2005/10/01 20:53:51 glebius Exp $
==== //depot/projects/superpages/src/etc/rc.subr#2 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: rc.subr,v 1.60 2003/07/26 05:13:47 lukem Exp $
-# $FreeBSD: src/etc/rc.subr,v 1.37 2005/08/24 16:25:47 yar Exp $
+# $FreeBSD: src/etc/rc.subr,v 1.38 2005/10/01 20:58:03 yar Exp $
#
# Copyright (c) 1997-2002 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -515,7 +515,7 @@
fi
if [ -z "$rc_arg" ]; then
- rc_usage "$_keywords"
+ rc_usage $_keywords
fi
if [ -n "$flags" ]; then # allow override from environment
@@ -797,7 +797,7 @@
;;
*)
- rc_usage "$_keywords"
+ rc_usage $_keywords
;;
esac
@@ -805,7 +805,7 @@
done
echo 1>&2 "$0: unknown directive '$rc_arg'."
- rc_usage "$_keywords"
+ rc_usage $_keywords
exit 1
}
==== //depot/projects/superpages/src/sys/dev/wi/if_wi.c#2 (text+ko) ====
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.191 2005/09/28 09:27:46 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.192 2005/10/02 03:55:07 avatar Exp $");
#define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */
#define WI_HERMES_STATS_WAR /* Work around stats counter bug. */
@@ -742,7 +742,7 @@
wi_write_val(sc, WI_RID_OWN_BEACON_INT, ic->ic_bintval);
wi_write_val(sc, WI_RID_BASIC_RATE, 0x03); /* 1, 2 */
wi_write_val(sc, WI_RID_SUPPORT_RATE, 0x0f); /* 1, 2, 5.5, 11 */
- wi_write_val(sc, WI_RID_DTIM_PERIOD, 1);
+ wi_write_val(sc, WI_RID_DTIM_PERIOD, ic->ic_dtim_period);
}
/*
More information about the p4-projects
mailing list