PERFORCE change 31465 for review
Marcel Moolenaar
marcel at FreeBSD.org
Mon May 19 01:10:25 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=31465
Change 31465 by marcel at marcel_nfs on 2003/05/19 01:09:39
IFC @31464
Affected files ...
.. //depot/projects/ia64/Makefile.inc1#61 integrate
.. //depot/projects/ia64/etc/rc.d/Makefile#13 integrate
.. //depot/projects/ia64/etc/rc.d/ldconfig#6 integrate
.. //depot/projects/ia64/lib/libc/gen/dlinfo.3#4 integrate
.. //depot/projects/ia64/lib/libc/gen/getfsent.3#3 integrate
.. //depot/projects/ia64/lib/libc/i386/sys/i386_vm86.2#5 integrate
.. //depot/projects/ia64/lib/libc/net/nsdispatch.3#6 integrate
.. //depot/projects/ia64/lib/libc/rpc/svc_generic.c#3 integrate
.. //depot/projects/ia64/lib/libgeom/Makefile#5 integrate
.. //depot/projects/ia64/libexec/rtld-elf/libmap.c#4 integrate
.. //depot/projects/ia64/libexec/rtld-elf/rtld.1#8 integrate
.. //depot/projects/ia64/release/Makefile#51 integrate
.. //depot/projects/ia64/release/alpha/dokern.sh#9 integrate
.. //depot/projects/ia64/release/alpha/drivers.conf#13 integrate
.. //depot/projects/ia64/release/alpha/fixit_crunch.conf#5 integrate
.. //depot/projects/ia64/release/i386/dokern.sh#18 integrate
.. //depot/projects/ia64/release/i386/fixit_crunch.conf#6 integrate
.. //depot/projects/ia64/release/ia64/doFS.sh#5 integrate
.. //depot/projects/ia64/release/pc98/dokern.sh#11 integrate
.. //depot/projects/ia64/release/pc98/fixit-small_crunch.conf#3 integrate
.. //depot/projects/ia64/release/pc98/fixit_crunch.conf#6 integrate
.. //depot/projects/ia64/release/scripts/doFS.sh#17 integrate
.. //depot/projects/ia64/release/sparc64/mkisoimages.sh#2 integrate
.. //depot/projects/ia64/sbin/Makefile#25 integrate
.. //depot/projects/ia64/sbin/bsdlabel/Makefile#5 integrate
.. //depot/projects/ia64/sbin/devd/devd.8#8 integrate
.. //depot/projects/ia64/sbin/gbde/Makefile#6 integrate
.. //depot/projects/ia64/sbin/mdmfs/mdmfs.8#9 integrate
.. //depot/projects/ia64/sbin/mount/mount.8#12 integrate
.. //depot/projects/ia64/sbin/mount_nfs/mount_nfs.8#9 integrate
.. //depot/projects/ia64/sbin/raidctl/raidctl.8#5 integrate
.. //depot/projects/ia64/sbin/sunlabel/Makefile#7 integrate
.. //depot/projects/ia64/sbin/sysctl/sysctl.8#9 integrate
.. //depot/projects/ia64/share/man/man4/Makefile#44 integrate
.. //depot/projects/ia64/share/man/man4/acpi.4#7 integrate
.. //depot/projects/ia64/share/man/man4/ehci.4#1 branch
.. //depot/projects/ia64/share/man/man4/man4.i386/cx.4#3 integrate
.. //depot/projects/ia64/share/man/man4/my.4#1 branch
.. //depot/projects/ia64/share/man/man5/rc.conf.5#37 integrate
.. //depot/projects/ia64/share/man/man9/signal.9#3 integrate
.. //depot/projects/ia64/share/mk/bsd.README#6 integrate
.. //depot/projects/ia64/sys/alpha/conf/GENERIC#22 integrate
.. //depot/projects/ia64/sys/amd64/amd64/machdep.c#5 integrate
.. //depot/projects/ia64/sys/boot/common/loader.8#17 integrate
.. //depot/projects/ia64/sys/conf/options#52 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-all.c#37 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#15 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-pci.h#10 integrate
.. //depot/projects/ia64/sys/dev/usb/ugen.c#12 integrate
.. //depot/projects/ia64/sys/dev/vinum/vinumio.c#15 integrate
.. //depot/projects/ia64/sys/i386/conf/GENERIC#35 integrate
.. //depot/projects/ia64/sys/ia64/ia64/machdep.c#69 integrate
.. //depot/projects/ia64/sys/ia64/ia64/pmap.c#62 integrate
.. //depot/projects/ia64/sys/ia64/ia64/swtch.s#14 delete
.. //depot/projects/ia64/sys/ia64/include/pmap.h#13 integrate
.. //depot/projects/ia64/sys/ia64/include/rse.h#2 delete
.. //depot/projects/ia64/sys/sys/ata.h#9 integrate
.. //depot/projects/ia64/sys/sys/mutex.h#13 integrate
.. //depot/projects/ia64/sys/ufs/ffs/ffs_rawread.c#4 integrate
.. //depot/projects/ia64/sys/vm/vm_object.c#54 integrate
.. //depot/projects/ia64/sys/vm/vm_object.h#21 integrate
.. //depot/projects/ia64/sys/vm/vm_pageout.c#38 integrate
.. //depot/projects/ia64/tools/make_libdeps.sh#4 integrate
.. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.1#2 integrate
.. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.pl#10 integrate
.. //depot/projects/ia64/tools/tools/tinderbox/tinderbox.1#2 integrate
.. //depot/projects/ia64/tools/tools/tinderbox/tinderbox.pl#9 integrate
.. //depot/projects/ia64/tools/tools/tinderbox/www/Makefile#2 integrate
.. //depot/projects/ia64/tools/tools/tinderbox/www/index.cgi#3 integrate
.. //depot/projects/ia64/usr.bin/fetch/fetch.1#7 integrate
.. //depot/projects/ia64/usr.sbin/burncd/burncd.8#13 integrate
.. //depot/projects/ia64/usr.sbin/pkg_install/info/pkg_info.1#6 integrate
.. //depot/projects/ia64/usr.sbin/syslogd/Makefile#3 integrate
.. //depot/projects/ia64/usr.sbin/syslogd/syslogd.c#17 integrate
Differences ...
==== //depot/projects/ia64/Makefile.inc1#61 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.357 2003/05/15 17:59:32 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.360 2003/05/18 20:22:26 ru Exp $
#
# Make command line options:
# -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
@@ -284,6 +284,8 @@
usr/libexec usr/share/misc
mkdir -p ${WORLDTMP}/${_dir}
.endfor
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
+ -p ${WORLDTMP}/usr/include
ln -sf ${.CURDIR}/sys ${WORLDTMP}
_legacy:
@echo
@@ -789,7 +791,8 @@
_generic_libs+= kerberos5/lib
.endif
-_prebuild_libs+= lib/libcom_err lib/libcrypt lib/libkvm lib/libmd \
+_prebuild_libs+= lib/libcom_err lib/libcrypt lib/libexpat \
+ lib/libkvm lib/libmd \
lib/libncurses lib/libopie lib/libpam lib/libradius \
lib/librpcsvc \
lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \
==== //depot/projects/ia64/etc/rc.d/Makefile#13 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.15 2003/04/24 08:20:47 mtm Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.16 2003/05/18 03:34:24 mtm Exp $
.include <bsd.own.mk>
@@ -7,7 +7,7 @@
apm apmd atm1 atm2.sh atm3.sh archdep bgfsck bootparams ccd cleanvar \
cleartmp cron devd devdb devfs dhclient diskless dmesg dumpon fsck \
hostname inetd initdiskless initrandom ip6fw ipfilter ipfs ipfw ipmon \
- ipnat ipsec ipxrouted isdnd jail kadmind kerberos keyserv kldxref \
+ ipnat ipsec ipxrouted isdnd jail kadmind kerberos keyserv kldxref kpasswdd \
ldconfig local localdaemons lomac lpd motd mountcritlocal mountcritremote \
mountd moused mroute6d mrouted msgs named netif network1 network2 network3 \
network_ipv6 nfsclient nfsd nfslocking nfsserver nisdomain ntpd \
==== //depot/projects/ia64/etc/rc.d/ldconfig#6 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: ldconfig,v 1.5 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/ldconfig,v 1.5 2003/04/30 07:12:09 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ldconfig,v 1.6 2003/05/18 03:39:39 mtm Exp $
#
# PROVIDE: ldconfig
@@ -20,8 +20,9 @@
{
case ${OSTYPE} in
FreeBSD)
+ _ins=
ldconfig=${ldconfig_command}
- checkyesno ldconfig_insecure && ldconfig="${ldconfig} -i"
+ checkyesno ldconfig_insecure && _ins="-i"
if [ -x "${ldconfig_command}" ]; then
_LDC=/usr/lib
for i in ${ldconfig_paths}; do
@@ -30,7 +31,7 @@
fi
done
echo 'ELF ldconfig path:' ${_LDC}
- ${ldconfig} -elf ${_LDC}
+ ${ldconfig} -elf ${_ins} ${_LDC}
# Legacy aout support for i386 only
case `sysctl -n hw.machine_arch` in
@@ -44,7 +45,7 @@
fi
done
echo 'a.out ldconfig path:' ${_LDC}
- ${ldconfig} -aout ${_LDC}
+ ${ldconfig} -aout ${_ins} ${_LDC}
;;
esac
fi
==== //depot/projects/ia64/lib/libc/gen/dlinfo.3#4 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/gen/dlinfo.3,v 1.4 2003/03/24 16:07:19 charnier Exp $
+.\" $FreeBSD: src/lib/libc/gen/dlinfo.3,v 1.5 2003/05/18 21:05:21 ru Exp $
.\"
.Dd February 14, 2003
.Os
@@ -195,7 +195,7 @@
dlinfo(RTLD_SELF, RTLD_DI_LINKMAP, &map);
while (map != NULL) {
- printf("%p: %s\n", map->l_addr, map->l_name);
+ printf("%p: %s\\n", map->l_addr, map->l_name);
map = map->l_next;
}
.Ed
@@ -227,7 +227,7 @@
path = &info->dls_serpath[0];
for (cnt = 1; cnt <= info->dls_cnt; cnt++, path++) {
- (void) printf("%2d: %s\n", cnt, path->dls_name);
+ (void) printf("%2d: %s\\n", cnt, path->dls_name);
}
.Ed
.Sh RETURN VALUES
==== //depot/projects/ia64/lib/libc/gen/getfsent.3#3 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)getfsent.3 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/gen/getfsent.3,v 1.12 2003/04/07 22:59:12 mdodd Exp $
+.\" $FreeBSD: src/lib/libc/gen/getfsent.3,v 1.13 2003/05/18 21:05:21 ru Exp $
.\"
.Dd April 7, 2003
.Dt GETFSENT 3
@@ -182,7 +182,7 @@
and
.Fn getfstab
functions appeared in
-.Fx 5.1.
+.Fx 5.1 .
.Sh BUGS
These functions use static data storage;
if the data is needed for future use, it should be
==== //depot/projects/ia64/lib/libc/i386/sys/i386_vm86.2#5 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/i386/sys/i386_vm86.2,v 1.13 2003/04/29 08:35:28 mdodd Exp $
+.\" $FreeBSD: src/lib/libc/i386/sys/i386_vm86.2,v 1.14 2003/05/18 21:05:21 ru Exp $
.\"
.Dd July 27, 1998
.Os
@@ -110,7 +110,7 @@
.Pp
.Fa state
will contain the state of the VME flag on return.
-\" .It Dv VM86_SET_VME
+.\" .It Dv VM86_SET_VME
.El
.Pp
vm86 mode is entered by calling
==== //depot/projects/ia64/lib/libc/net/nsdispatch.3#6 (text+ko) ====
@@ -1,5 +1,5 @@
.\" $NetBSD: nsdispatch.3,v 1.8 1999/03/22 19:44:53 garbled Exp $
-.\" $FreeBSD: src/lib/libc/net/nsdispatch.3,v 1.9 2003/04/17 14:14:22 nectar Exp $
+.\" $FreeBSD: src/lib/libc/net/nsdispatch.3,v 1.10 2003/05/18 21:05:21 ru Exp $
.\"
.\" Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -238,7 +238,8 @@
"nsswitch.conf\*(lp4\*(rp"
manual pages.
The
-.Fx Project
+.Fx
+Project
added the support for threads and NSS modules, and normalized the uses
of
.Fn nsdispatch
==== //depot/projects/ia64/lib/libc/rpc/svc_generic.c#3 (text+ko) ====
@@ -39,7 +39,7 @@
static char sccsid[] = "@(#)svc_generic.c 1.21 89/02/28 Copyr 1988 Sun Micro";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_generic.c,v 1.4 2002/03/22 23:18:37 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_generic.c,v 1.5 2003/05/18 15:07:25 mbr Exp $");
/*
* svc_generic.c, Server side for RPC.
@@ -245,7 +245,7 @@
_listen(fd, SOMAXCONN);
} else {
if (_bind(fd,
- (struct sockaddr *)(void *)&bindaddr->addr.buf,
+ (struct sockaddr *)bindaddr->addr.buf,
(socklen_t)si.si_alen) < 0) {
warnx(
"svc_tli_create: could not bind to requested address");
==== //depot/projects/ia64/lib/libgeom/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libgeom/Makefile,v 1.5 2003/03/23 10:15:02 phk Exp $
+# $FreeBSD: src/lib/libgeom/Makefile,v 1.6 2003/05/17 19:05:17 ru Exp $
LIB= geom
SRCS+= geom_getxml.c
@@ -11,6 +11,9 @@
WARNS?= 3
+DPADD= ${LIBBSDXML} ${LIBSBUF}
+LDADD= -lbsdxml -lsbuf
+
MAN= libgeom.3
MLINKS+= \
==== //depot/projects/ia64/libexec/rtld-elf/libmap.c#4 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/libexec/rtld-elf/libmap.c,v 1.3 2003/04/30 19:05:53 kan Exp $
+ * $FreeBSD: src/libexec/rtld-elf/libmap.c,v 1.4 2003/05/19 07:10:12 mdodd Exp $
*/
#include <stdio.h>
@@ -9,6 +9,9 @@
#include <sys/queue.h>
#include <sys/param.h>
+#include "debug.h"
+#include "rtld.h"
+
#ifndef _PATH_LIBMAP_CONF
#define _PATH_LIBMAP_CONF "/etc/libmap.conf"
#endif
@@ -119,7 +122,7 @@
if (!iseol(*cp)) continue;
*cp = '\0';
- lm_add(p, strdup(f), strdup(t));
+ lm_add(p, xstrdup(f), xstrdup(t));
}
fclose(fp);
return;
@@ -169,9 +172,9 @@
#endif
if ((lml = lmp_find(p)) == NULL)
- lml = lmp_init(strdup(p));
+ lml = lmp_init(xstrdup(p));
- lm = malloc(sizeof(struct lm));
+ lm = xmalloc(sizeof(struct lm));
lm->f = f;
lm->t = t;
TAILQ_INSERT_HEAD(lml, lm, lm_link);
@@ -185,8 +188,14 @@
if (p != NULL && (lml = lmp_find(p)) != NULL) {
t = lml_find(lml, f);
- if (t != NULL)
+ if (t != NULL) {
+ /*
+ * Add a global mapping if we have
+ * a successful constrained match.
+ */
+ lm_add(NULL, xstrdup(f), xstrdup(t));
return (t);
+ }
}
lml = lmp_find("$DEFAULT$");
if (lml != NULL)
@@ -224,7 +233,7 @@
{
struct lmp *lmp;
- lmp = malloc(sizeof(struct lmp));
+ lmp = xmalloc(sizeof(struct lmp));
lmp->p = n;
TAILQ_INIT(&lmp->lml);
TAILQ_INSERT_HEAD(&lmp_head, lmp, lmp_link);
==== //depot/projects/ia64/libexec/rtld-elf/rtld.1#8 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/libexec/rtld-elf/rtld.1,v 1.33 2003/05/16 21:34:21 ru Exp $
+.\" $FreeBSD: src/libexec/rtld-elf/rtld.1,v 1.34 2003/05/17 19:46:49 rwatson Exp $
.\"
.\" Copyright (c) 1995 Paul Kranenburg
.\" All rights reserved.
@@ -165,4 +165,5 @@
.Xr ld 1 ,
.Xr ldd 1 ,
.Xr elf 5 ,
+.Xr libmap.conf 5 ,
.Xr ldconfig 8
==== //depot/projects/ia64/release/Makefile#51 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.775 2003/05/08 03:25:17 obrien Exp $
+# $FreeBSD: src/release/Makefile,v 1.777 2003/05/18 19:34:03 jmallett Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
# [RELEASETAG=tag]
@@ -216,7 +216,11 @@
MFSSIZE= 8192
.endif
+.if exists(/sbin/bsdlabel)
+DISKLABEL?= bsdlabel
+.else
DISKLABEL?= disklabel
+.endif
ZIPNSPLIT= gzip --no-name -9 -c | split -b 1423k -
@@ -332,12 +336,12 @@
fi
.if defined(EXTLOCALDIR)
rm -rf ${CHROOTDIR}/usr/local
- cd ${CHROOTDIR}/usr && cp -R ${EXTLOCALDIR} local
+ cd ${CHROOTDIR}/usr && cp -R -H ${EXTLOCALDIR} local
.endif
rm -rf ${CHROOTDIR}/usr/src
.if defined(EXTSRCDIR)
cd ${CHROOTDIR}/usr && \
- cp -R ${EXTSRCDIR} src
+ cp -R -H ${EXTSRCDIR} src
.else
cd ${CHROOTDIR}/usr && \
${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} ${CVS_SRCARGS} ${RELEASESRCMODULE}
@@ -355,7 +359,7 @@
.if !defined(NODOC)
rm -rf ${CHROOTDIR}/usr/doc
.if defined(EXTDOCDIR)
- cd ${CHROOTDIR}/usr && cp -R ${EXTDOCDIR} doc
+ cd ${CHROOTDIR}/usr && cp -R -H ${EXTDOCDIR} doc
.else
cd ${CHROOTDIR}/usr && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} ${CVS_DOCARGS} ${RELEASEDOCMODULE}
.endif
==== //depot/projects/ia64/release/alpha/dokern.sh#9 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/release/alpha/dokern.sh,v 1.70 2003/05/15 01:28:39 obrien Exp $
+# $FreeBSD: src/release/alpha/dokern.sh,v 1.72 2003/05/18 03:52:22 scottl Exp $
#
# XXX sort by order in GENERIC, not alphabetical
@@ -27,6 +27,7 @@
-e '/SMP/d' \
-e '/ atapifd /d' \
-e '/ atapist /d' \
+ -e '/ mpt /d' \
-e '/ ch /d' \
-e '/ pass /d' \
-e '/ sa /d' \
@@ -36,15 +37,10 @@
-e '/ ppbus /d' \
-e '/ lpt /d' \
-e '/ ppi /d' \
- -e '/ sf /d' \
- -e '/ sis /d' \
- -e '/ ste /d' \
- -e '/ wb /d' \
-e '/ random /d' \
-e '/ sl /d' \
-e '/ ppp /d' \
-e '/ pty /d' \
- -e '/ gif /d' \
-e '/ faith /d' \
-e '/ uhci /d' \
-e '/ ohci /d' \
@@ -66,5 +62,7 @@
# XXX: blank line above intentional so lines may be added below the last
# entry with ease.
+echo "options MUTEX_NOINLINE"
+
echo "options SCSI_NO_OP_STRINGS"
echo "options SCSI_NO_SENSE_STRINGS"
==== //depot/projects/ia64/release/alpha/drivers.conf#13 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/release/alpha/drivers.conf,v 1.17 2003/05/14 15:38:44 obrien Exp $
+# $FreeBSD: src/release/alpha/drivers.conf,v 1.18 2003/05/17 11:58:28 wilko Exp $
#
# drv: driver name in kernel config file
@@ -52,14 +52,18 @@
ahc ahc 3 disk "Adaptec 2940"
ahc ahc_eisa 3 disk "Adaptec 2940 EISA"
ahc ahc_pci 3 disk "Adaptec 2940 PCI"
+isp isp 3 disk "Qlogic SCSI"
amr amr 3 disk "AMI MegaRAID"
ispfw ispfw 3 disk "Qlogic SCSI firmware modules"
mlx mlx 3 disk "Mylex DAC-family RAID"
-mpt mpt 3 disk "LSI-Logic Fusion"
+sf if_sf 3 network "Adaptec AIC-6915 (``Starfire'')"
+sis if_sis 3 network "SiS 900 / 7016"
+ste if_ste 3 network "Sundance ST201 (D-Link DFE-550TX)"
+wb if_wb 3 network "Winbond W89C840F"
axe if_axe 3 network "ASIX AX88172 USB 2.0 Ethernet"
-if_gif if_gif 3 network "IPv6 and IPv4 tunneling"
-if_tun if_tun 3 network "Packet tunnel"
+gif if_gif 3 network "IPv6 and IPv4 tunneling"
+tun if_tun 3 network "Packet tunnel"
CD9660 cd9660 3 options "ISO 9660 Filesystem"
NFSCLIENT nfsclient 3 options "Network Filesystem Client"
==== //depot/projects/ia64/release/alpha/fixit_crunch.conf#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/alpha/fixit_crunch.conf,v 1.34 2003/04/21 19:14:32 ru Exp $
+# $FreeBSD: src/release/alpha/fixit_crunch.conf,v 1.35 2003/05/17 19:16:28 ru Exp $
buildopts -DRELEASE_CRUNCH -Dlint
@@ -7,9 +7,10 @@
progs ln ls mkdir mv rm rmdir
srcdirs /usr/src/sbin
-progs clri disklabel dmesg mknod
+progs bsdlabel clri dmesg mknod
progs mount mount_cd9660
progs reboot restore swapon umount
+ln bsdlabel disklabel
ln restore rrestore
srcdirs /usr/src/usr.bin
@@ -19,4 +20,4 @@
progs chown chroot
ln chown chgrp
-libs -lutil -lm -ledit -lncurses -ltermcap -lkvm
+libs -ledit -lgeom -lkvm -lm -lncurses -lutil
==== //depot/projects/ia64/release/i386/dokern.sh#18 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/release/i386/dokern.sh,v 1.79 2003/05/05 02:04:55 scottl Exp $
+# $FreeBSD: src/release/i386/dokern.sh,v 1.80 2003/05/18 03:52:22 scottl Exp $
#
sed \
@@ -40,6 +40,8 @@
-e '/ uscanner /d' \
-e 's/ident.*GENERIC/ident BOOTMFS/g'
+echo "options MUTEX_NOINLINE"
+
echo "options NETGRAPH"
echo "options NETGRAPH_ETHER"
echo "options NETGRAPH_PPPOE"
==== //depot/projects/ia64/release/i386/fixit_crunch.conf#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/i386/fixit_crunch.conf,v 1.9 2003/04/21 19:14:32 ru Exp $
+# $FreeBSD: src/release/i386/fixit_crunch.conf,v 1.10 2003/05/17 19:16:28 ru Exp $
buildopts -DRELEASE_CRUNCH
@@ -7,9 +7,10 @@
progs ln ls mkdir mv rm rmdir sleep sync
srcdirs /usr/src/sbin
-progs clri disklabel dmesg fdisk mknod
+progs bsdlabel clri dmesg fdisk mknod
progs mount mount_cd9660 mount_msdosfs
progs reboot restore swapon umount
+ln bsdlabel disklabel
ln restore rrestore
srcdirs /usr/src/usr.bin
@@ -21,4 +22,4 @@
progs chown chroot
ln chown chgrp
-libs -lutil -lm -ledit -lncurses -ltermcap -lkvm
+libs -ledit -lgeom -lkvm -lm -lncurses -lutil
==== //depot/projects/ia64/release/ia64/doFS.sh#5 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/release/ia64/doFS.sh,v 1.7 2003/04/23 09:01:35 ru Exp $
+# $FreeBSD: src/release/ia64/doFS.sh,v 1.8 2003/05/17 19:16:28 ru Exp $
#
# See also: ../scripts/doFS.sh
#
@@ -20,7 +20,7 @@
if [ x$FSLABEL != "xefi" ]; then
DOFS_SH=`dirname $0`/../scripts/`basename $0`
echo "Transferring control to $DOFS_SH..."
- exec sh $DOFS_SH disklabel ia64 $FSIMG $RD $MNT $FSSIZE $FSPROTO $FSINODE $FSLABEL
+ exec sh $DOFS_SH bsdlabel ia64 $FSIMG $RD $MNT $FSSIZE $FSPROTO $FSINODE $FSLABEL
fi
export BLOCKSIZE=512
==== //depot/projects/ia64/release/pc98/dokern.sh#11 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/release/pc98/dokern.sh,v 1.75 2003/04/17 06:04:44 jhay Exp $
+# $FreeBSD: src/release/pc98/dokern.sh,v 1.76 2003/05/18 03:52:22 scottl Exp $
#
if [ $# -lt 1 ]; then
@@ -114,6 +114,8 @@
fi
+echo "options MUTEX_NOINLINE"
+
echo "options NETGRAPH"
echo "options NETGRAPH_ETHER"
echo "options NETGRAPH_PPPOE"
==== //depot/projects/ia64/release/pc98/fixit-small_crunch.conf#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/pc98/fixit-small_crunch.conf,v 1.2 2003/04/21 19:14:32 ru Exp $
+# $FreeBSD: src/release/pc98/fixit-small_crunch.conf,v 1.3 2003/05/17 19:16:28 ru Exp $
buildopts -DRELEASE_CRUNCH
@@ -7,9 +7,10 @@
progs ln ls mkdir mv rm rmdir sleep sync
srcdirs /usr/src/sbin
-progs clri disklabel dmesg fdisk mknod
+progs bsdlabel clri dmesg fdisk mknod
progs mount mount_cd9660 mount_msdosfs
progs reboot restore swapon umount
+ln bsdlabel disklabel
ln restore rrestore
special fdisk srcdir /usr/src/sbin/fdisk_pc98
@@ -22,4 +23,4 @@
progs chown chroot
ln chown chgrp
-libs -lutil -lm -ledit -lncurses -ltermcap -lkvm
+libs -ledit -lgeom -lkvm -lm -lncurses -lutil
==== //depot/projects/ia64/release/pc98/fixit_crunch.conf#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/pc98/fixit_crunch.conf,v 1.9 2003/04/21 19:14:32 ru Exp $
+# $FreeBSD: src/release/pc98/fixit_crunch.conf,v 1.10 2003/05/17 19:16:28 ru Exp $
buildopts -DRELEASE_CRUNCH
@@ -7,9 +7,10 @@
progs ln ls mkdir mv rm rmdir sleep sync
srcdirs /usr/src/sbin
-progs clri disklabel dmesg fdisk mknod
+progs bsdlabel clri dmesg fdisk mknod
progs mount mount_cd9660 mount_msdosfs
progs reboot restore swapon umount
+ln bsdlabel disklabel
ln restore rrestore
special fdisk srcdir /usr/src/sbin/fdisk_pc98
@@ -23,4 +24,4 @@
progs chown chroot
ln chown chgrp
-libs -lutil -lm -ledit -lncurses -ltermcap -lkvm
+libs -ledit -lgeom -lkvm -lm -lncurses -lutil
==== //depot/projects/ia64/release/scripts/doFS.sh#17 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/release/scripts/doFS.sh,v 1.51 2003/05/16 13:59:12 ru Exp $
+# $FreeBSD: src/release/scripts/doFS.sh,v 1.52 2003/05/17 19:16:28 ru Exp $
#
set -ex
@@ -20,7 +20,7 @@
#
# We don't have any bootblocks on ia64. Note that -B implies -r,
# so we have to specifically specify -r when we don't have -B.
-# disklabel fails otherwise.
+# bsdlabel fails otherwise.
#
if [ -f "${RD}/trees/base/boot/boot" ]; then
BOOT="-B -b ${RD}/trees/base/boot/boot"
==== //depot/projects/ia64/release/sparc64/mkisoimages.sh#2 (text+ko) ====
@@ -4,7 +4,7 @@
# Author: Jordan K Hubbard
# Date: 22 June 2001
#
-# $FreeBSD: src/release/sparc64/mkisoimages.sh,v 1.1 2002/10/13 18:36:06 jake Exp $
+# $FreeBSD: src/release/sparc64/mkisoimages.sh,v 1.2 2003/05/17 19:16:28 ru Exp $
#
# This script is used by release/Makefile to build the (optional) ISO images
# for a FreeBSD release. It is considered architecture dependent since each
@@ -30,7 +30,7 @@
if [ "x$1" = "x-b" ]; then
dd if=/dev/zero of=${IMG} bs=512 count=1024
MD=`mdconfig -a -t vnode -f ${IMG}`
- disklabel -Brw ${MD} auto
+ sunlabel -Brw ${MD} auto
newfs /dev/${MD}c
mount /dev/${MD}c ${MNT}
mkdir ${MNT}/boot
==== //depot/projects/ia64/sbin/Makefile#25 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.5 (Berkeley) 3/31/94
-# $FreeBSD: src/sbin/Makefile,v 1.120 2003/05/05 21:28:07 phk Exp $
+# $FreeBSD: src/sbin/Makefile,v 1.121 2003/05/17 20:40:42 peter Exp $
# XXX MISSING: icheck ncheck
@@ -112,4 +112,8 @@
SUBDIR+=sunlabel
.endif
+.if ${MACHINE_ARCH} == "amd64"
+SUBDIR+=fdisk
+.endif
+
.include <bsd.subdir.mk>
==== //depot/projects/ia64/sbin/bsdlabel/Makefile#5 (text+ko) ====
@@ -1,34 +1,29 @@
# @(#)Makefile 8.2 (Berkeley) 3/17/94
-# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.15 2003/05/05 21:28:08 phk Exp $
+# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.17 2003/05/17 19:06:45 ru Exp $
+
+.PATH: ${.CURDIR}/../../sys/geom
PROG= bsdlabel
SRCS= bsdlabel.c geom_bsd_enc.c
-#MAN+= bsdlabel.5
+#MAN= bsdlabel.5
MAN+= bsdlabel.8
-.if ${MACHINE_ARCH} == "i386"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "alpha"
LINKS= ${BINDIR}/bsdlabel ${BINDIR}/disklabel
-MLINKS+= bsdlabel.8 disklabel.8
+MLINKS= bsdlabel.8 disklabel.8
.endif
-.if ${MACHINE_ARCH} == "alpha"
-LINKS= ${BINDIR}/bsdlabel ${BINDIR}/disklabel
-MLINKS+= bsdlabel.8 disklabel.8
-.endif
+DPADD= ${LIBGEOM}
+LDADD= -lgeom
-DDADD= ${LIBGEOM}
-LDADD= -lgeom -lbsdxml -lsbuf
-
.if ${MACHINE} == "pc98"
-CFLAGS+= -DPC98
+CFLAGS+=-DPC98
.endif
-.PATH: ${.CURDIR}/../../sys/geom
-
.include <bsd.prog.mk>
-test: ${PROG}
+test: ${PROG}
sh ${.CURDIR}/runtest.sh
-testx: ${PROG}
+testx: ${PROG}
sh -x ${.CURDIR}/runtest.sh
==== //depot/projects/ia64/sbin/devd/devd.8#8 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/devd/devd.8,v 1.8 2003/04/21 06:26:08 imp Exp $
+.\" $FreeBSD: src/sbin/devd/devd.8,v 1.9 2003/05/17 22:21:27 ru Exp $
.\"
.Dd October 17, 2002
.Dt DEVD 8
@@ -47,7 +47,7 @@
.It Fl d
Run in the foreground instead of becoming a daemon.
.It Fl n
-Don't process all pending events before becoming a daemon.
+Do not process all pending events before becoming a daemon.
Instaed, call daemon right away.
.El
.Sh IMPLEMENTATION NOTES
==== //depot/projects/ia64/sbin/gbde/Makefile#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sbin/gbde/Makefile,v 1.9 2003/04/16 11:54:11 ru Exp $
+# $FreeBSD: src/sbin/gbde/Makefile,v 1.10 2003/05/17 19:05:17 ru Exp $
PROG= gbde
SRCS= gbde.c template.c
@@ -23,8 +23,8 @@
CLEANFILES+= template.c
MAN= gbde.8
-DPADD= ${LIBMD} ${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF}
-LDADD= -lmd -lutil -lgeom -lbsdxml -lsbuf
+DPADD= ${LIBMD} ${LIBUTIL} ${LIBGEOM}
+LDADD= -lmd -lutil -lgeom
template.c: template.txt
file2c 'const char template[] = {' ',0};' \
==== //depot/projects/ia64/sbin/mdmfs/mdmfs.8#9 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.16 2003/05/05 23:41:17 dougb Exp $
+.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.17 2003/05/17 22:31:48 ru Exp $
.\"
.Dd August 5, 2001
.Dt MDMFS 8
@@ -291,6 +291,7 @@
.Pp
The same file system created as an entry in
.Pa /etc/fstab :
+.Pp
.Dl "md /tmp mfs rw,-s32m 2 0"
.Pp
Create and mount a 16 megabyte malloc-backed file system on
==== //depot/projects/ia64/sbin/mount/mount.8#12 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mount.8 8.8 (Berkeley) 6/16/94
-.\" $FreeBSD: src/sbin/mount/mount.8,v 1.58 2003/04/07 22:58:34 mdodd Exp $
+.\" $FreeBSD: src/sbin/mount/mount.8,v 1.59 2003/05/17 22:35:35 ru Exp $
.\"
.Dd April 7, 2003
.Dt MOUNT 8
@@ -412,17 +412,17 @@
(kernel compile-time), or dynamic basis (loaded as a kernel module by
.Xr kldload 8 ) .
.Sh ENVIRONMENT
-.Bl -tag -width PATH_FSTAB
-.It Pa PATH_FSTAB
+.Bl -tag -width ".Ev PATH_FSTAB"
+.It Ev PATH_FSTAB
If the environment variable
-.Pa PATH_FSTAB
-is set all operations are performed against the specified file.
-.Pa PATH_FSTAB
+.Ev PATH_FSTAB
+is set, all operations are performed against the specified file.
+.Ev PATH_FSTAB
will not be honored if the process environment or memory address space is
considred
.Dq tainted .
(See
-.Fn issetugid
+.Xr issetugid 2
for more information.)
.El
.Sh FILES
==== //depot/projects/ia64/sbin/mount_nfs/mount_nfs.8#9 (text+ko) ====
@@ -30,15 +30,14 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mount_nfs.8 8.3 (Berkeley) 3/29/95
+.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.39 2003/05/17 22:53:44 ru Exp $
.\"
-.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.38 2003/05/11 00:38:58 trhodes Exp $
-.\""
-.Dd March 29, 1995
+.Dd May 11, 2003
.Dt MOUNT_NFS 8
.Os
.Sh NAME
.Nm mount_nfs
-.Nd mount nfs file systems
+.Nd mount NFS file systems
.Sh SYNOPSIS
.Nm
.Op Fl 23NPTUbcdiLls
@@ -58,7 +57,7 @@
.Nm
utility calls the
.Xr mount 2
-system call to prepare and graft a remote nfs file system
+system call to prepare and graft a remote NFS file system
.Pq Ar rhost : Ns Ar path
on to the file system tree at the point
.Ar node .
@@ -94,8 +93,8 @@
.Bl -tag -width indent
.It Fl 2
Use the NFS Version 2 protocol (the default is to try version 3 first
-then version 2). Note that NFS version 2 has a file size limit of 2
-gigabytes.
+then version 2).
+Note that NFS version 2 has a file size limit of 2 gigabytes.
.It Fl 3
Use the NFS Version 3 protocol.
.It Fl D
@@ -107,7 +106,9 @@
.It Fl I
Set the readdir read size to the specified value.
The value should normally
-be a multiple of DIRBLKSIZ that is <= the read size for the mount.
+be a multiple of
+.Dv DIRBLKSIZ
+that is <= the read size for the mount.
.It Fl L
Do
.Em not
@@ -115,10 +116,10 @@
.Xr fcntl 2
locks over the wire.
All locks will be local and not seen by the server
-and likewise not seen by other NFS clients. This removes
-the need to run the
+and likewise not seen by other NFS clients.
+This removes the need to run the
.Xr rpcbind 8
-service and the
+service and the
.Xr rpc.statd 8
and
.Xr rpc.lockd 8
@@ -208,68 +209,75 @@
See the
.Xr mount 8
man page for possible options and their meanings.
-The following NFS specific option is also available:
+The following NFS specific options are also available:
.Bl -tag -width indent
-.It port=<port_number>
+.It Cm port Ns = Ns Aq Ar port_number
Use specified port number for NFS requests.
The default is to query the portmapper for the NFS port.
-.It acregmin=<seconds>
-.It acregmax=<seconds>
-.It acdirmin=<seconds>
-.It acdirmax=<seconds>
+.It Cm acregmin Ns = Ns Aq Ar seconds
+.It Cm acregmax Ns = Ns Aq Ar seconds
+.It Cm acdirmin Ns = Ns Aq Ar seconds
+.It Cm acdirmax Ns = Ns Aq Ar seconds
When attributes of files are cached, a timeout calculated to determine
-whether a given cache entry has expired. These four values determine the
-upper and lower bounds of the timeouts for ``directory'' attributes and
-``regular'' (ie: everything else). The default values are 3 -> 60 seconds
-for regular files, and 30 -> 60 seconds for directories. The algorithm to
-calculate the timeout is based on the age of the file. The older the file,
+whether a given cache entry has expired.
+These four values determine the upper and lower bounds of the timeouts for
+.Dq directory
+attributes and
+.Dq regular
+(ie: everything else).
+The default values are 3 -> 60 seconds
+for regular files, and 30 -> 60 seconds for directories.
+The algorithm to calculate the timeout is based on the age of the file.
+The older the file,
the longer the cache is considered valid, subject to the limits above.
-.It noinet4
-.It noinet6
-Disables AF_INET or AF_INET6 connections. Useful for hosts that have
+.It Cm noinet4 , noinet6
+Disables
+.Dv AF_INET
+or
+.Dv AF_INET6
+connections.
+Useful for hosts that have
both an A record and an AAAA record for the same name.
.El
-.Pp
-.Bl -tag -width "dumbtimerXX"
-\fBHistoric \&-o options\fR
-.Pp
+.Bl -tag -width ".Cm dumbtimer"
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list