PERFORCE change 98226 for review
John Birrell
jb at FreeBSD.org
Wed May 31 13:38:13 PDT 2006
http://perforce.freebsd.org/chv.cgi?CH=98226
Change 98226 by jb at jb_freebsd2 on 2006/05/31 20:35:48
IFC
Fixes the ahb.c breakage from yesterday.
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#10 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/busdma_machdep.c#2 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#4 integrate
.. //depot/projects/dtrace/src/sys/arm/include/cpuconf.h#2 integrate
.. //depot/projects/dtrace/src/sys/arm/include/pmap.h#4 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/libi386/biosdisk.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ahb/ahb.c#2 integrate
.. //depot/projects/dtrace/src/sys/kern/vnode_if.src#3 integrate
.. //depot/projects/dtrace/src/sys/sys/elf_common.h#3 integrate
.. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_vnops.c#2 integrate
.. //depot/projects/dtrace/src/tools/regression/execve/Makefile#1 branch
.. //depot/projects/dtrace/src/tools/regression/execve/doexec.c#1 branch
.. //depot/projects/dtrace/src/tools/regression/execve/execve.t#1 branch
.. //depot/projects/dtrace/src/tools/regression/execve/tests/badinterplen#1 branch
.. //depot/projects/dtrace/src/tools/regression/execve/tests/devnullscript#1 branch
.. //depot/projects/dtrace/src/tools/regression/execve/tests/goodaout.c#1 branch
.. //depot/projects/dtrace/src/tools/regression/execve/tests/goodscript#1 branch
.. //depot/projects/dtrace/src/tools/regression/execve/tests/nonexistshell#1 branch
.. //depot/projects/dtrace/src/tools/regression/execve/tests/scriptarg#1 branch
.. //depot/projects/dtrace/src/tools/regression/execve/tests/scriptarg-nospace#1 branch
.. //depot/projects/dtrace/src/tools/regression/sockets/unix_cmsg/unix_cmsg.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sysinstall/installUpgrade.c#3 integrate
.. //depot/projects/dtrace/www/en/commercial/isp.xml#5 integrate
.. //depot/projects/dtrace/www/en/releases/5.5R/errata.html#2 integrate
.. //depot/projects/dtrace/www/en/releases/5.5R/schedule.sgml#4 integrate
.. //depot/projects/dtrace/www/en/releng/index.sgml#7 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#10 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.562 2006/05/30 13:08:02 piso Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.565 2006/05/31 16:12:48 vd Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -684,12 +684,12 @@
<para>Andrew J. Korty
<email>ajk at iu.edu</email></para>
</listitem>
-
+
<listitem>
<para>Andrew Khlebutin
<email>andrey at hm.perm.ru</email></para>
</listitem>
-
+
<listitem>
<para>Andrew Kolchoogin
<email>andrew at rinet.ru</email></para>
@@ -1026,6 +1026,11 @@
</listitem>
<listitem>
+ <para>Bartek Rutkowski
+ <email>r at robakdesign.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Bartosz Fabianowski
<email>freebsd at chillt.de</email></para>
</listitem>
@@ -2709,11 +2714,6 @@
</listitem>
<listitem>
- <para>exprim
- <email>probyte at deviate.fi</email></para>
- </listitem>
-
- <listitem>
<para>FUJIMOTO Kensaku
<email>fujimoto at oscar.elec.waseda.ac.jp</email></para>
</listitem>
@@ -3038,13 +3038,13 @@
</listitem>
<listitem>
- <para>Gerhard Gonter
- <email>g.gonter at ieee.org</email></para>
+ <para>Geraud Continsouzas
+ <email>geraud at gcu.info</email></para>
</listitem>
<listitem>
- <para>Geraud Continsouzas
- <email>geraud at gcu.info</email></para>
+ <para>Gerhard Gonter
+ <email>g.gonter at ieee.org</email></para>
</listitem>
<listitem>
@@ -4452,7 +4452,6 @@
<email>jhaarman-keyword-tinyerpPort.fd583c at projects.synantics.net</email></para>
</listitem>
-
<listitem>
<para>Jorge Goncalves
<email>j at bug.fe.up.pt</email></para>
@@ -5803,6 +5802,11 @@
</listitem>
<listitem>
+ <para>Max N. Boyarov
+ <email>m.boyarov at bsd.by</email></para>
+ </listitem>
+
+ <listitem>
<para>Maxim Bolotin
<email>max at rsu.ru</email></para>
</listitem>
@@ -5813,11 +5817,6 @@
</listitem>
<listitem>
- <para>Max N. Boyarov
- <email>m.boyarov at bsd.by</email></para>
- </listitem>
-
- <listitem>
<para>Maxim Tuliuk
<email>mt at primats.org.ua</email></para>
</listitem>
@@ -6783,6 +6782,11 @@
</listitem>
<listitem>
+ <para>Oleg R. Muhutdinov
+ <email>mor at whiteluna.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Oleg Semyonov
<email>os at altavista.net</email></para>
</listitem>
@@ -6793,11 +6797,6 @@
</listitem>
<listitem>
- <para>Oleg R. Muhutdinov
- <email>mor at whiteluna.com</email></para>
- </listitem>
-
- <listitem>
<para>Oleg V. Volkov
<email>rover at lglobus.ru</email></para>
</listitem>
@@ -7063,13 +7062,13 @@
</listitem>
<listitem>
- <para>Pawel Worach
- <email>pawel.worach at gmail.com</email></para>
+ <para>Pavel Veretennikov
+ <email>vermut at kid.lv</email></para>
</listitem>
<listitem>
- <para>Pavel Veretennikov
- <email>vermut at kid.lv</email></para>
+ <para>Pawel Worach
+ <email>pawel.worach at gmail.com</email></para>
</listitem>
<listitem>
@@ -8137,11 +8136,6 @@
</listitem>
<listitem>
- <para>Simun Mikecin
- <email>sime at logos.hr</email></para>
- </listitem>
-
- <listitem>
<para>Simon Schubert
<email>corecode at corecode.ath.cx</email></para>
</listitem>
@@ -8152,6 +8146,11 @@
</listitem>
<listitem>
+ <para>Simun Mikecin
+ <email>sime at logos.hr</email></para>
+ </listitem>
+
+ <listitem>
<para>Sin'ichiro MIYATANI
<email>siu at phaseone.co.jp</email></para>
</listitem>
@@ -8467,7 +8466,7 @@
</listitem>
<listitem>
- <para>Sulev-Madis Silber
+ <para>Sulev-Madis Silber
<email>madis555 at hot.ee</email></para>
</listitem>
@@ -9182,7 +9181,8 @@
</listitem>
<listitem>
- <para>Vladimir Kurtikov <email>vk at vk.pp.ru</email></para>
+ <para>Vladimir Kurtikov
+ <email>vk at vk.pp.ru</email></para>
</listitem>
<listitem>
@@ -9551,7 +9551,7 @@
<listitem>
<para>Zach Thompson
- <email>hideo at lastamericanempire.com</email><para>
+ <email>hideo at lastamericanempire.com</email></para>
</listitem>
<listitem>
@@ -9593,6 +9593,11 @@
<para>der Mouse
<email>mouse at Collatz.McRCIM.McGill.EDU</email></para>
</listitem>
+
+ <listitem>
+ <para>exprim
+ <email>probyte at deviate.fi</email></para>
+ </listitem>
</itemizedlist>
<!--
==== //depot/projects/dtrace/src/sys/arm/arm/busdma_machdep.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.25 2006/03/01 23:04:25 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.26 2006/05/31 15:50:33 cognet Exp $");
/*
* MacPPC bus dma support routines
@@ -806,13 +806,16 @@
if (op & BUS_DMASYNC_PREWRITE)
cpu_dcache_wb_range((vm_offset_t)buf, len);
- if (op & BUS_DMASYNC_POSTREAD) {
- if ((((vm_offset_t)buf | len) & arm_dcache_align_mask) == 0)
- cpu_dcache_inv_range((vm_offset_t)buf, len);
- else
- cpu_dcache_wbinv_range((vm_offset_t)buf, len);
-
+ if (op & BUS_DMASYNC_PREREAD) {
+ if ((vm_offset_t)buf & arm_dcache_align_mask)
+ cpu_dcache_wbinv_range((vm_offset_t)buf &
+ ~arm_dcache_align_mask, arm_dcache_align);
+ if (((vm_offset_t)buf + len) & arm_dcache_align_mask)
+ cpu_dcache_wbinv_range(((vm_offset_t)buf + len) &
+ ~arm_dcache_align_mask, arm_dcache_align);
}
+ if (op & BUS_DMASYNC_POSTREAD)
+ cpu_dcache_inv_range((vm_offset_t)buf, len);
}
void
@@ -823,7 +826,7 @@
int resid;
struct iovec *iov;
- if (!(op & (BUS_DMASYNC_PREWRITE | BUS_DMASYNC_POSTREAD)))
+ if (op == BUS_DMASYNC_POSTWRITE)
return;
if (map->flags & DMAMAP_COHERENT)
return;
==== //depot/projects/dtrace/src/sys/arm/arm/pmap.c#4 (text+ko) ====
@@ -147,7 +147,7 @@
#include "opt_vm.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.50 2006/05/30 23:50:45 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.51 2006/05/31 15:52:11 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -915,20 +915,38 @@
l1idx = L1_IDX(va);
+ mtx_assert(&vm_page_queue_mtx, MA_OWNED);
if ((l2 = pm->pm_l2[L2_IDX(l1idx)]) == NULL) {
/*
* No mapping at this address, as there is
* no entry in the L1 table.
* Need to allocate a new l2_dtable.
*/
+again_l2table:
+ vm_page_unlock_queues();
if ((l2 = pmap_alloc_l2_dtable()) == NULL) {
+ vm_page_lock_queues();
return (NULL);
}
- bzero(l2, sizeof(*l2));
- /*
- * Link it into the parent pmap
- */
- pm->pm_l2[L2_IDX(l1idx)] = l2;
+ vm_page_lock_queues();
+ if (pm->pm_l2[L2_IDX(l1idx)] != NULL) {
+ vm_page_unlock_queues();
+ uma_zfree(l2table_zone, l2);
+ vm_page_lock_queues();
+ l2 = pm->pm_l2[L2_IDX(l1idx)];
+ if (l2 == NULL)
+ goto again_l2table;
+ /*
+ * Someone already allocated the l2_dtable while
+ * we were doing the same.
+ */
+ } else {
+ bzero(l2, sizeof(*l2));
+ /*
+ * Link it into the parent pmap
+ */
+ pm->pm_l2[L2_IDX(l1idx)] = l2;
+ }
}
l2b = &l2->l2_bucket[L2_BUCKET(l1idx)];
@@ -943,7 +961,19 @@
* No L2 page table has been allocated. Chances are, this
* is because we just allocated the l2_dtable, above.
*/
+again_ptep:
+ vm_page_unlock_queues();
ptep = (void*)uma_zalloc(l2zone, M_NOWAIT);
+ vm_page_lock_queues();
+ if (l2b->l2b_kva != 0) {
+ /* We lost the race. */
+ vm_page_unlock_queues();
+ uma_zfree(l2zone, ptep);
+ vm_page_lock_queues();
+ if (l2b->l2b_kva == 0)
+ goto again_ptep;
+ return (l2b);
+ }
l2b->l2b_phys = vtophys(ptep);
if (ptep == NULL) {
/*
==== //depot/projects/dtrace/src/sys/arm/include/cpuconf.h#2 (text+ko) ====
@@ -34,7 +34,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.5 2005/05/26 16:05:22 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.6 2006/05/31 13:06:08 cognet Exp $
*
*/
@@ -57,15 +57,15 @@
*/
#if (defined(CPU_ARM7TDMI) || defined(CPU_ARM8) || defined(CPU_ARM9) || \
- defined(CPU_ARM10) || defined(CPU_SA110) || defined(CPU_SA1100) || \
- defined(CPU_SA1110) || defined(CPU_IXP12X0) || defined(CPU_XSCALE_IXP425))
+ defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) || \
+ defined(CPU_IXP12X0) || defined(CPU_XSCALE_IXP425))
#define ARM_ARCH_4 1
#else
#define ARM_ARCH_4 0
#endif
#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \
- defined(CPU_XSCALE_PXA2X0))
+ defined(CPU_XSCALE_PXA2X0)) || defined(CPU_ARM10)
#define ARM_ARCH_5 1
#else
#define ARM_ARCH_5 0
==== //depot/projects/dtrace/src/sys/arm/include/pmap.h#4 (text+ko) ====
@@ -44,14 +44,14 @@
* from: @(#)pmap.h 7.4 (Berkeley) 5/12/91
* from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30
*
- * $FreeBSD: src/sys/arm/include/pmap.h,v 1.17 2006/05/13 23:41:15 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/pmap.h,v 1.18 2006/05/31 11:57:37 cognet Exp $
*/
#ifndef _MACHINE_PMAP_H_
#define _MACHINE_PMAP_H_
#include <machine/pte.h>
-
+#include <machine/cpuconf.h>
/*
* Pte related macros
*/
==== //depot/projects/dtrace/src/sys/boot/i386/libi386/biosdisk.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.46 2005/12/19 09:00:11 sobomax Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.47 2006/05/31 09:05:49 iedowse Exp $");
/*
* BIOS disk device handling.
@@ -1037,9 +1037,6 @@
*/
if (bbuf != NULL)
bcopy(p, breg, x * BIOSDISK_SECSIZE);
- p += (x * BIOSDISK_SECSIZE);
- dblk += x;
- resid -= x;
/* Loop retrying the operation a couple of times. The BIOS may also retry. */
for (retry = 0; retry < 3; retry++) {
@@ -1103,6 +1100,9 @@
if (result) {
return(-1);
}
+ p += (x * BIOSDISK_SECSIZE);
+ dblk += x;
+ resid -= x;
}
/* hexdump(dest, (blks * BIOSDISK_SECSIZE)); */
==== //depot/projects/dtrace/src/sys/dev/ahb/ahb.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/ahb/ahb.c,v 1.34 2005/05/29 04:42:17 nyan Exp $
+ * $FreeBSD: src/sys/dev/ahb/ahb.c,v 1.35 2006/05/31 14:33:23 mjacob Exp $
*/
#include <sys/param.h>
@@ -526,7 +526,7 @@
}
ahb->num_ecbs = MIN(ahb->num_ecbs,
- ahb->ha_inq_data->scsi_data.reserved[1]);
+ ahb->ha_inq_data->scsi_data.spc2_flags);
printf("ahb%ld: %.8s %s SCSI Adapter, FW Rev. %.4s, ID=%d, %d ECBs\n",
ahb->unit, ahb->ha_inq_data->scsi_data.product,
(ahb->ha_inq_data->scsi_data.flags & 0x4) ? "Differential"
==== //depot/projects/dtrace/src/sys/kern/vnode_if.src#3 (text+ko) ====
@@ -27,7 +27,7 @@
# SUCH DAMAGE.
#
# @(#)vnode_if.src 8.12 (Berkeley) 5/14/95
-# $FreeBSD: src/sys/kern/vnode_if.src,v 1.82 2006/05/30 20:49:54 dds Exp $
+# $FreeBSD: src/sys/kern/vnode_if.src,v 1.83 2006/05/31 14:06:06 dds Exp $
#
#
@@ -362,7 +362,6 @@
};
-#XXX lock vp ? ? ?
%! lock pre vop_lock_pre
%! lock post vop_lock_post
@@ -373,7 +372,6 @@
};
-#XXX unlock vp L ? L
%! unlock pre vop_unlock_pre
%! unlock post vop_unlock_post
==== //depot/projects/dtrace/src/sys/sys/elf_common.h#3 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/sys/elf_common.h,v 1.18 2005/12/19 20:20:36 marcel Exp $
+ * $FreeBSD: src/sys/sys/elf_common.h,v 1.19 2006/05/31 13:47:32 maxim Exp $
*/
#ifndef _SYS_ELF_COMMON_H_
@@ -48,8 +48,8 @@
u_int32_t n_type; /* Type of this note. */
} Elf_Note;
-/* Indexes into the e_ident array. Keep synced with
- http://www.sco.com/developer/gabi/ch4.eheader.html */
+/* Indexes into the e_ident array. Keep synced with
+ http://www.sco.com/developers/gabi/latest/ch4.eheader.html */
#define EI_MAG0 0 /* Magic number, byte 0. */
#define EI_MAG1 1 /* Magic number, byte 1. */
#define EI_MAG2 2 /* Magic number, byte 2. */
==== //depot/projects/dtrace/src/sys/ufs/ufs/ufs_vnops.c#2 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_vnops.c,v 1.275 2006/03/19 21:29:20 tegge Exp $");
+__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_vnops.c,v 1.277 2006/05/31 15:55:52 maxim Exp $");
#include "opt_mac.h"
#include "opt_quota.h"
@@ -509,22 +509,35 @@
}
if (vap->va_size != VNOVAL) {
/*
- * Disallow write attempts on read-only filesystems;
- * unless the file is a socket, fifo, or a block or
- * character device resident on the filesystem.
+ * XXX most of the following special cases should be in
+ * callers instead of in N filesystems. The VDIR check
+ * mostly already is.
*/
switch (vp->v_type) {
case VDIR:
return (EISDIR);
case VLNK:
case VREG:
+ /*
+ * Truncation should have an effect in these cases.
+ * Disallow it if the filesystem is read-only or
+ * the file is being snapshotted.
+ */
if (vp->v_mount->mnt_flag & MNT_RDONLY)
return (EROFS);
if ((ip->i_flags & SF_SNAPSHOT) != 0)
return (EPERM);
break;
default:
- break;
+ /*
+ * According to POSIX, the result is unspecified
+ * for file types other than regular files,
+ * directories and shared memory objects. We
+ * don't support shared memory objects in the file
+ * system, and have dubious support for truncating
+ * symlinks. Just ignore the request in other cases.
+ */
+ return (0);
}
if ((error = UFS_TRUNCATE(vp, vap->va_size, IO_NORMAL,
cred, td)) != 0)
==== //depot/projects/dtrace/src/tools/regression/sockets/unix_cmsg/unix_cmsg.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/tools/regression/sockets/unix_cmsg/unix_cmsg.c,v 1.1 2006/05/29 18:40:55 maxim Exp $");
+__FBSDID("$FreeBSD: src/tools/regression/sockets/unix_cmsg/unix_cmsg.c,v 1.2 2006/05/31 08:10:34 maxim Exp $");
#include <sys/types.h>
#include <sys/resource.h>
@@ -162,12 +162,15 @@
* Output the help message (-h switch).
*/
static void
-usage(void)
+usage(int quick)
{
const struct test_func *test_func;
- fprintf(stderr, "Usage: %s [-dhz] [-t <socktype>] [testno]\n\n", __progname);
- fprintf(stderr, " Options are:\n\
+ fprintf(stderr, "Usage: %s [-dhz] [-t <socktype>] [testno]\n",
+ __progname);
+ if (quick)
+ return;
+ fprintf(stderr, "\n Options are:\n\
-d\t\t\tOutput debugging information\n\
-h\t\t\tOutput this help message and exit\n\
-t <socktype>\t\tRun test only for the given socket type:\n\
@@ -314,15 +317,14 @@
int opt, dgramflag, streamflag;
u_int testno1, testno2;
- opterr = 0;
dgramflag = streamflag = 0;
- while ((opt = getopt(argc, argv, ":dht:z")) != -1)
+ while ((opt = getopt(argc, argv, "dht:z")) != -1)
switch (opt) {
case 'd':
debug = 1;
break;
case 'h':
- usage();
+ usage(0);
return (EX_OK);
case 't':
if (strcmp(optarg, "stream") == 0)
@@ -335,14 +337,10 @@
case 'z':
no_control_data = 1;
break;
- case ':':
- errx(EX_USAGE, "option -%c requires an argument", optopt);
- /* NOTREACHED */
case '?':
- errx(EX_USAGE, "invalid switch -%c", optopt);
- /* NOTREACHED */
default:
- errx(EX_SOFTWARE, "unexpected option -%c", optopt);
+ usage(1);
+ return (EX_USAGE);
}
if (optind < argc) {
@@ -350,7 +348,7 @@
errx(EX_USAGE, "too many arguments");
testno1 = strtonum(argv[optind], 0, UINT_MAX, &errstr);
if (errstr != NULL)
- errx(EX_USAGE, "wrong test number");
+ errx(EX_USAGE, "wrong test number: %s", errstr);
} else
testno1 = 0;
==== //depot/projects/dtrace/src/usr.sbin/sysinstall/installUpgrade.c#3 (text+ko) ====
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $FreeBSD: src/usr.sbin/sysinstall/installUpgrade.c,v 1.87 2006/05/04 20:10:34 ceri Exp $
+ * $FreeBSD: src/usr.sbin/sysinstall/installUpgrade.c,v 1.89 2006/05/31 19:16:34 ceri Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -68,9 +68,9 @@
{ JUST_COPY, "csh.login", TRUE, NULL },
{ JUST_COPY, "csh.logout", TRUE, NULL },
{ JUST_COPY, "cvsupfile", TRUE, NULL },
+ { JUST_COPY, "devfs.conf", TRUE, NULL },
{ JUST_COPY, "dhclient.conf", TRUE, NULL },
{ JUST_COPY, "disktab", TRUE, NULL },
- { JUST_COPY, "dm.conf", TRUE, NULL },
{ JUST_COPY, "dumpdates", TRUE, NULL },
{ JUST_COPY, "exports", TRUE, NULL },
{ JUST_COPY, "fbtab", TRUE, NULL },
@@ -89,21 +89,27 @@
{ JUST_COPY, "login.conf", TRUE, NULL },
{ JUST_COPY, "mail", TRUE, NULL },
{ JUST_COPY, "mail.rc", TRUE, NULL },
+ { JUST_COPY, "mac.conf", TRUE, NULL },
{ JUST_COPY, "make.conf", TRUE, NULL },
{ JUST_COPY, "manpath.config", TRUE, NULL },
{ JUST_COPY, "master.passwd", FALSE, NULL },
+ { JUST_COPY, "mergemaster.rc", TRUE, NULL },
{ JUST_COPY, "motd", TRUE, NULL },
{ JUST_COPY, "namedb", TRUE, NULL },
{ JUST_COPY, "networks", TRUE, NULL },
{ JUST_COPY, "newsyslog.conf", TRUE, NULL },
{ JUST_COPY, "nsmb.conf", TRUE, NULL },
{ JUST_COPY, "nsswitch.conf", TRUE, NULL },
+ { JUST_COPY, "ntp.conf", TRUE, NULL },
{ JUST_COPY, "pam.conf", TRUE, NULL },
{ JUST_COPY, "passwd", TRUE, NULL },
{ JUST_COPY, "periodic", TRUE, NULL },
+ { JUST_COPY, "pf.conf", TRUE, NULL },
+ { JUST_COPY, "portsnap.conf", TRUE, NULL },
{ JUST_COPY, "ppp", TRUE, NULL },
{ JUST_COPY, "printcap", TRUE, NULL },
{ JUST_COPY, "profile", TRUE, NULL },
+ { JUST_COPY, "protocols", TRUE, NULL },
{ JUST_COPY, "pwd.db", TRUE, NULL },
{ JUST_COPY, "rc.local", TRUE, NULL },
{ JUST_COPY, "rc.firewall", TRUE, NULL },
@@ -116,12 +122,13 @@
{ JUST_COPY, "services", TRUE, NULL },
{ JUST_COPY, "shells", TRUE, NULL },
{ JUST_COPY, "skeykeys", TRUE, NULL },
+ { JUST_COPY, "snmpd.config", TRUE, NULL },
{ JUST_COPY, "spwd.db", TRUE, NULL },
+ { JUST_COPY, "src.conf", TRUE, NULL },
{ JUST_COPY, "ssh", TRUE, NULL },
{ JUST_COPY, "sysctl.conf", TRUE, NULL },
{ JUST_COPY, "syslog.conf", TRUE, NULL },
{ JUST_COPY, "ttys", TRUE, NULL },
- { JUST_COPY, "uucp", TRUE, NULL },
{ 0, NULL, FALSE, NULL },
};
@@ -290,11 +297,11 @@
}
msgNotify("chflags'ing old binaries - please wait.");
- (void)vsystem("chflags -R noschg /bin /sbin /usr/sbin /usr/bin /usr/lib /usr/libexec /var/empty /kernel*");
+ (void)vsystem("chflags -R noschg /bin /sbin /usr/sbin /usr/bin /usr/lib /usr/libexec /var/empty /boot/kernel*");
- if (file_readable("/kernel")) {
- msgNotify("Moving old kernel to /kernel.prev");
- if (system("mv /kernel /kernel.prev")) {
+ if (directory_exists("/boot/kernel")) {
+ msgNotify("Moving old kernel to /boot/kernel.prev");
+ if (system("mv /boot/kernel /boot/kernel.prev")) {
if (!msgYesNo("Hmmm! I couldn't move the old kernel over! Do you want to\n"
"treat this as a big problem and abort the upgrade? Due to the\n"
"way that this upgrade process works, you will have to reboot\n"
@@ -302,8 +309,9 @@
systemShutdown(1);
}
else
- msgConfirm("NOTICE: Your old kernel is in /kernel.prev should this upgrade\n"
- "fail for any reason and you need to boot your old kernel");
+ msgConfirm("NOTICE: Your old kernel is in /boot/kernel.prev should this\n"
+ "upgrade fail for any reason and you need to boot your old\n"
+ "kernel.");
}
}
==== //depot/projects/dtrace/www/en/commercial/isp.xml#5 (text+ko) ====
@@ -4,7 +4,7 @@
<entries>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $FreeBSD: www/en/commercial/isp.xml,v 1.46 2006/05/17 21:20:09 keramida Exp $
+ $FreeBSD: www/en/commercial/isp.xml,v 1.47 2006/05/31 17:38:17 remko Exp $
</cvs:keyword>
</cvs:keywords>
@@ -331,7 +331,7 @@
<description>
Integrity Host provides shared hosting, VPS (Virtual Private
Servers), and fully managed dedicated servers that run on
- multiple versions of FreeBSD. cPanel and Fastastico are
+ multiple versions of FreeBSD. cPanel and Fantastico are
available and bandwidth allocation is generous.
</description>
</entry>
==== //depot/projects/dtrace/www/en/releases/5.5R/errata.html#2 (text) ====
@@ -106,7 +106,9 @@
<hr />
<h2 class="SECT1"><a id="LATE-NEWS" name="LATE-NEWS">4 Late-Breaking News</a></h2>
-<p>No news.</p>
+<p>(31 May 2006) Thanks to the efforts of Paul Saab, torrents for the various FreeBSD
+5.5-RELEASE ISO images are now available at <a href="http://torrents.freebsd.org:8080/"
+target="_top">http://torrents.freebsd.org:8080/</a>.</p>
</div>
</div>
==== //depot/projects/dtrace/www/en/releases/5.5R/schedule.sgml#4 (text) ====
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
<!ENTITY base CDATA "../..">
<!ENTITY email 'freebsd-qa'>
-<!ENTITY date "$FreeBSD: www/en/releases/5.5R/schedule.sgml,v 1.11 2006/05/25 20:23:56 bmah Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/5.5R/schedule.sgml,v 1.12 2006/05/31 15:30:25 bmah Exp $">
<!ENTITY local.rel "5.5">
<!ENTITY local.rel.tag "5_5">
<!ENTITY title "FreeBSD &local.rel; Release Process">
@@ -291,7 +291,7 @@
<tr>
<td>Turn over to the secteam</td>
<td>TBD</td>
- <td>--</td>
+ <td>31 May 2006</td>
<td>RELENG_&local.rel.tag; branch is handed over to
the FreeBSD Security Officer Team in one or two weeks after the
announcement.</td>
==== //depot/projects/dtrace/www/en/releng/index.sgml#7 (text+ko) ====
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/releng/index.sgml,v 1.183 2006/05/30 19:51:39 bmah Exp $">
+<!ENTITY date "$FreeBSD: www/en/releng/index.sgml,v 1.184 2006/05/31 15:29:30 bmah Exp $">
<!ENTITY email 're'>
<!ENTITY title "Release Engineering Information">
<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
@@ -133,7 +133,7 @@
<tr>
<td> <tt>RELENG_5_5</tt> </td>
<td> Frozen </td>
- <td> &contact.re; </td>
+ <td> &contact.so; </td>
<td> FreeBSD 5.5 supported errata fix branch. </td>
</tr>
More information about the p4-projects
mailing list