Date: Sat, 9 Nov 2002 06:26:41 -0800 (PST) From: Juli Mallett <jmallett@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 20897 for review Message-ID: <200211091426.gA9EQfGs073096@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=20897 Change 20897 by jmallett@jmallett_dalek on 2002/11/09 06:26:17 IFC. Affected files ... .. //depot/projects/mips/etc/rc.d/Makefile#2 integrate .. //depot/projects/mips/etc/rc.d/devd#1 branch .. //depot/projects/mips/etc/rc.subr#2 integrate .. //depot/projects/mips/lib/libc/locale/mbrlen.3#2 integrate .. //depot/projects/mips/lib/libc/locale/mbstowcs.c#3 integrate .. //depot/projects/mips/lib/libc/locale/wctrans.c#2 integrate .. //depot/projects/mips/lib/libc/posix1e/acl.3#2 integrate .. //depot/projects/mips/lib/libdisk/disk.c#7 integrate .. //depot/projects/mips/lib/libdisk/write_alpha_disk.c#3 integrate .. //depot/projects/mips/lib/libdisk/write_i386_disk.c#2 integrate .. //depot/projects/mips/lib/libdisk/write_pc98_disk.c#3 integrate .. //depot/projects/mips/lib/libfetch/fetch.3#2 integrate .. //depot/projects/mips/release/alpha/dokern.sh#3 integrate .. //depot/projects/mips/release/alpha/drivers.conf#4 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/hardware/Makefile#2 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml#2 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/installation/Makefile#2 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#3 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/installation/ia64/Makefile#1 branch .. //depot/projects/mips/release/doc/en_US.ISO8859-1/installation/ia64/article.sgml#1 branch .. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/Makefile#2 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#8 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/ia64/Makefile#1 branch .. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#1 branch .. //depot/projects/mips/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml#5 integrate .. //depot/projects/mips/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml#2 integrate .. //depot/projects/mips/release/doc/share/examples/Makefile.relnotesng#3 integrate .. //depot/projects/mips/secure/lib/libcrypto/Makefile.inc#3 integrate .. //depot/projects/mips/share/man/man4/Makefile#5 integrate .. //depot/projects/mips/share/man/man4/fwe.4#1 branch .. //depot/projects/mips/sys/alpha/alpha/machdep.c#4 integrate .. //depot/projects/mips/sys/alpha/alpha/prom.c#2 integrate .. //depot/projects/mips/sys/alpha/include/bus.h#4 integrate .. //depot/projects/mips/sys/alpha/tlsb/dwlpx.c#2 integrate .. //depot/projects/mips/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/mips/sys/conf/NOTES#7 integrate .. //depot/projects/mips/sys/conf/files#8 integrate .. //depot/projects/mips/sys/conf/files.i386#5 integrate .. //depot/projects/mips/sys/conf/files.pc98#5 integrate .. //depot/projects/mips/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/mips/sys/dev/em/README#2 integrate .. //depot/projects/mips/sys/dev/em/if_em.c#2 integrate .. //depot/projects/mips/sys/dev/em/if_em.h#2 integrate .. //depot/projects/mips/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/mips/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/mips/sys/dev/em/if_em_osdep.h#2 integrate .. //depot/projects/mips/sys/dev/fb/vga.c#2 integrate .. //depot/projects/mips/sys/dev/gfb/gfb_pci.c#2 integrate .. //depot/projects/mips/sys/dev/gx/if_gxvar.h#2 integrate .. //depot/projects/mips/sys/dev/hea/eni_buffer.c#3 integrate .. //depot/projects/mips/sys/dev/hea/eni_vcm.c#3 integrate .. //depot/projects/mips/sys/dev/my/if_my.c#3 integrate .. //depot/projects/mips/sys/dev/nge/if_nge.c#3 integrate .. //depot/projects/mips/sys/dev/ppbus/ppb_msq.h#2 integrate .. //depot/projects/mips/sys/dev/rc/rc.c#2 integrate .. //depot/projects/mips/sys/dev/sym/sym_defs.h#2 integrate .. //depot/projects/mips/sys/dev/tga/tga_pci.c#2 integrate .. //depot/projects/mips/sys/dev/twe/twe_compat.h#2 integrate .. //depot/projects/mips/sys/dev/usb/umass.c#3 integrate .. //depot/projects/mips/sys/fs/msdosfs/denode.h#2 integrate .. //depot/projects/mips/sys/geom/geom_bsd.c#5 integrate .. //depot/projects/mips/sys/geom/geom_dump.c#5 integrate .. //depot/projects/mips/sys/i386/conf/NOTES#5 integrate .. //depot/projects/mips/sys/i386/i386/vm86.c#3 integrate .. //depot/projects/mips/sys/i386/isa/gpib.c#2 integrate .. //depot/projects/mips/sys/kern/imgact_elf.c#5 integrate .. //depot/projects/mips/sys/kern/kern_mac.c#6 integrate .. //depot/projects/mips/sys/kern/subr_trap.c#4 integrate .. //depot/projects/mips/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/mips/sys/libkern/qsort.c#2 integrate .. //depot/projects/mips/sys/modules/Makefile#6 integrate .. //depot/projects/mips/sys/net/radix.c#2 integrate .. //depot/projects/mips/sys/net/zlib.c#3 integrate .. //depot/projects/mips/sys/netatm/atm_cm.c#2 integrate .. //depot/projects/mips/sys/netatm/atm_cm.h#2 integrate .. //depot/projects/mips/sys/netatm/atm_device.c#2 integrate .. //depot/projects/mips/sys/netatm/atm_if.c#2 integrate .. //depot/projects/mips/sys/netatm/atm_if.h#2 integrate .. //depot/projects/mips/sys/netatm/atm_signal.c#2 integrate .. //depot/projects/mips/sys/netatm/atm_stack.h#2 integrate .. //depot/projects/mips/sys/netatm/atm_subr.c#2 integrate .. //depot/projects/mips/sys/netatm/atm_var.h#2 integrate .. //depot/projects/mips/sys/netatm/ipatm/ipatm_if.c#2 integrate .. //depot/projects/mips/sys/netatm/ipatm/ipatm_load.c#2 integrate .. //depot/projects/mips/sys/netatm/ipatm/ipatm_var.h#2 integrate .. //depot/projects/mips/sys/netatm/port.h#2 integrate .. //depot/projects/mips/sys/netatm/spans/spans_kxdr.c#2 integrate .. //depot/projects/mips/sys/netatm/uni/q2110_sigaa.c#2 integrate .. //depot/projects/mips/sys/netatm/uni/q2110_sigcpcs.c#2 integrate .. //depot/projects/mips/sys/netatm/uni/qsaal1_sigaa.c#2 integrate .. //depot/projects/mips/sys/netatm/uni/qsaal1_sigcpcs.c#2 integrate .. //depot/projects/mips/sys/netatm/uni/sscf_uni_lower.c#2 integrate .. //depot/projects/mips/sys/netatm/uni/sscf_uni_upper.c#2 integrate .. //depot/projects/mips/sys/netatm/uni/sscf_uni_var.h#2 integrate .. //depot/projects/mips/sys/netatm/uni/sscop_lower.c#2 integrate .. //depot/projects/mips/sys/netatm/uni/sscop_pdu.c#2 integrate .. //depot/projects/mips/sys/netatm/uni/sscop_sigaa.c#2 integrate .. //depot/projects/mips/sys/netatm/uni/sscop_sigcpcs.c#2 integrate .. //depot/projects/mips/sys/netatm/uni/sscop_subr.c#2 integrate .. //depot/projects/mips/sys/netatm/uni/sscop_upper.c#2 integrate .. //depot/projects/mips/sys/netatm/uni/sscop_var.h#2 integrate .. //depot/projects/mips/sys/netatm/uni/unisig_decode.c#2 integrate .. //depot/projects/mips/sys/netatm/uni/unisig_encode.c#2 integrate .. //depot/projects/mips/sys/netatm/uni/unisig_var.h#2 integrate .. //depot/projects/mips/sys/netgraph/ng_bridge.c#2 integrate .. //depot/projects/mips/sys/netgraph/ng_one2many.c#2 integrate .. //depot/projects/mips/sys/netgraph/ng_parse.c#2 integrate .. //depot/projects/mips/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/mips/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/mips/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/mips/sys/netinet/in_proto.c#3 integrate .. //depot/projects/mips/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/mips/sys/netinet/ip_output.c#4 integrate .. //depot/projects/mips/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/mips/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/mips/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/mips/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/mips/sys/netipx/ipx_ip.c#3 integrate .. //depot/projects/mips/sys/netncp/ncp_rq.c#2 integrate .. //depot/projects/mips/sys/netsmb/smb_subr.c#2 integrate .. //depot/projects/mips/sys/opencrypto/crypto.c#4 integrate .. //depot/projects/mips/sys/opencrypto/cryptodev.c#4 integrate .. //depot/projects/mips/sys/pci/amd.c#3 integrate .. //depot/projects/mips/sys/pci/if_mn.c#3 integrate .. //depot/projects/mips/sys/pci/if_ste.c#2 integrate .. //depot/projects/mips/sys/pci/if_ti.c#3 integrate .. //depot/projects/mips/sys/pci/if_tireg.h#2 integrate .. //depot/projects/mips/sys/pci/intpm.c#2 integrate .. //depot/projects/mips/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/mips/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/mips/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/mips/sys/security/mac_none/mac_none.c#5 integrate .. //depot/projects/mips/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/mips/sys/security/mac_test/mac_test.c#5 integrate .. //depot/projects/mips/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/mips/sys/sys/mac_policy.h#5 integrate .. //depot/projects/mips/sys/sys/mchain.h#2 integrate .. //depot/projects/mips/sys/sys/proc.h#6 integrate .. //depot/projects/mips/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/mips/sys/vm/vm_page.c#6 integrate .. //depot/projects/mips/tools/regression/lib/libc/locale/Makefile#3 integrate .. //depot/projects/mips/tools/regression/lib/libc/locale/test-mblen.c#1 branch .. //depot/projects/mips/tools/regression/lib/libc/locale/test-mbstowcs.c#1 branch .. //depot/projects/mips/tools/regression/lib/libc/locale/test-mbtowc.c#1 branch .. //depot/projects/mips/tools/regression/lib/libc/locale/test-wcstombs.c#1 branch .. //depot/projects/mips/tools/regression/lib/libc/locale/test-wctomb.c#1 branch .. //depot/projects/mips/usr.bin/make/var.c#5 integrate .. //depot/projects/mips/usr.bin/yes/yes.c#2 integrate .. //depot/projects/mips/usr.sbin/adduser/adduser.8#2 integrate Differences ... ==== //depot/projects/mips/etc/rc.d/Makefile#2 (text+ko) ==== @@ -1,11 +1,11 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.8 2002/09/06 01:23:31 peter Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.9 2002/11/09 07:45:53 imp Exp $ .include <bsd.own.mk> FILES= DAEMON LOGIN NETWORKING SERVERS abi accounting addswap adjkerntz amd \ apm apmd atm1 atm2.sh atm3.sh archdep bgfsck bootparams ccd cleanvar \ - cleartmp cron devdb devfs diskless dmesg dumpon fsck inetd \ + cleartmp cron devd devdb devfs diskless dmesg dumpon fsck inetd \ initdiskless initrandom ip6fw ipfilter ipfw ipmon ipnat ipsec \ ipxrouted isdnd kadmind kerberos keyserv ldconfig local \ localdaemons lomac lpd motd mountcritlocal mountcritremote \ ==== //depot/projects/mips/etc/rc.subr#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.49 2002/05/21 12:31:01 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.6 2002/09/12 17:27:36 gordon Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.7 2002/11/08 17:06:15 gordon Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -132,7 +132,7 @@ return 1 ;; *) - warn "\$${1} is not set properly." + warn "\$${1} is not set properly - see rc.conf(5)." return 1 ;; esac @@ -839,7 +839,7 @@ # rc_usage() { - echo -n 1>&2 "usage: $0 [fast|force](" + echo -n 1>&2 "Usage: $0 [fast|force](" _sep= for _elem in $*; do @@ -851,18 +851,6 @@ } # -# _echo prefix message -# Display message preceded by "$prefix:". Log to syslog as well. -# XXX - syslogd may not be listening (especially if this subroutine -# is called at boot before syslogd has had a chance to startup). -# -_echo() -{ - [ -x /usr/bin/logger ] && /usr/bin/logger "$0: $1: $2" - echo "$0: $1: $2" -} - -# # err exitval message # Display message to stderr and log to the syslog, and exit with exitval. # @@ -871,7 +859,10 @@ exitval=$1 shift - _echo 1>&2 "ERROR" "$*" + if [ -x /usr/bin/logger ]; then + logger "$0: ERROR: $*" + fi + echo 1>&2 "$0: ERROR: $*" exit $exitval } @@ -881,7 +872,10 @@ # warn() { - _echo 1>&2 "WARNING" "$*" + if [ -x /usr/bin/logger ]; then + logger "$0: WARNING: $*" + fi + echo 1>&2 "$0: WARNING: $*" } # @@ -890,12 +884,15 @@ # info() { - _echo "INFO" "$*" + if [ -x /usr/bin/logger ]; then + logger "$0: INFO: $*" + fi + echo "$0: INFO: $*" } # # debug message -# If debugging is enabled in rc.conf output message to stderr and syslog. +# If debugging is enabled in rc.conf output message to stderr. # BEWARE that you don't call any subroutine that itself calls this # function. # @@ -903,7 +900,7 @@ { case ${rc_debug} in [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) - _echo 1>&2 "DEBUG" "$*" + echo 1>&2 "$0: DEBUG: $*" return ;; esac ==== //depot/projects/mips/lib/libc/locale/mbrlen.3#2 (text+ko) ==== @@ -22,8 +22,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/mbrlen.3,v 1.3 2002/10/03 14:07:26 tjr Exp $ -.Dd October 4, 2002 +.\" $FreeBSD: src/lib/libc/locale/mbrlen.3,v 1.5 2002/11/09 10:21:01 tjr Exp $ +.Dd November 11, 2002 .Dt MBRLEN 3 .Os .Sh NAME @@ -39,8 +39,23 @@ The .Fn mbrlen function determines the the number of bytes constituting the -multibyte character sequence pointer to by -.Fa s . +multibyte character sequence pointed to by +.Fa s , +examining at most +.Fa n +bytes. +.Pp +The +.Ft mbstate_t +argument, +.Fa ps , +is used to keep track of the shift state. +If it is +.Dv NULL , +.Fn mbrlen +uses an internal, static +.Ft mbstate_t +object. .Pp It is equivalent to: .Pp ==== //depot/projects/mips/lib/libc/locale/mbstowcs.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/mbstowcs.c,v 1.5 2002/10/27 10:41:21 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/mbstowcs.c,v 1.6 2002/11/09 04:13:26 tjr Exp $"); #include <errno.h> #include <stdlib.h> @@ -67,6 +67,7 @@ errno = EILSEQ; return (-1); } + return (cnt); } /* Convert, store and count characters. */ ==== //depot/projects/mips/lib/libc/locale/wctrans.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/wctrans.c,v 1.1 2002/08/04 12:09:08 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/wctrans.c,v 1.2 2002/11/09 05:19:08 tjr Exp $"); #include <ctype.h> #include <errno.h> @@ -47,10 +47,10 @@ switch (desc) { case _WCT_TOLOWER: - wc = tolower(wc); + wc = towlower(wc); break; case _WCT_TOUPPER: - wc = toupper(wc); + wc = towupper(wc); break; case _WCT_ERROR: default: ==== //depot/projects/mips/lib/libc/posix1e/acl.3#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2000, 2001 Robert N. M. Watson +.\" Copyright (c) 2000, 2001, 2002 Robert N. M. Watson .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl.3,v 1.18 2001/10/01 16:08:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl.3,v 1.19 2002/11/08 15:01:28 rwatson Exp $ .\" .Dd January 28, 2000 .Dt ACL 3 @@ -179,11 +179,9 @@ routines may change over time, and as such are not documented. They are not intended to be called directly without going through the library. -.Sh IMPLEMENTATION NOTES -.Fx Ns 's -support for POSIX.1e interfaces and features is still under -development at this time. .Sh SEE ALSO +.Xr getfacl 1 , +.Xr setfacl 1 , .Xr acl_add_perm 3 , .Xr acl_calc_mask 3 , .Xr acl_clear_perms 3 , @@ -227,6 +225,12 @@ .Fx 4.0 ; .Fx 5.0 was the first version to include a complete ACL implementation based -on extended attributes. +on extended attributes for the UFS and UFS2 file systems. +.Pp +.Xr getfacl 1 +and +.Xr setfacl 1 +describe the user tools that permit direct manipulation of complete file +ACLs. .Sh AUTHORS .An Robert N M Watson ==== //depot/projects/mips/lib/libdisk/disk.c#7 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.103 2002/11/07 14:54:53 nyan Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.105 2002/11/08 15:25:15 nyan Exp $"); #include <stdio.h> #include <stdlib.h> @@ -251,7 +251,6 @@ } if (platform == p_alpha && !strcmp(t, "BSD") && d->chunks->part->part == NULL) { - o = d->chunks->size; if (Add_Chunk(d, 0, d->chunks->size, name, freebsd, 0, 0, "-")) DPRINT(("Failed to add 'freebsd' chunk")); } @@ -266,17 +265,42 @@ printf("%s [%s] %jd %jd\n", t, n, (intmax_t)(off / s), (intmax_t) (len / s)); if (!strcmp(t, "SUN")) i = Add_Chunk(d, off, len, n, part, 0, 0, 0); - else if (!strncmp(t, "MBR", 3) && ty == 165) - i = Add_Chunk(d, off, len, n, freebsd, ty, 0, 0); - else if (!strncmp(t, "MBR", 3)) - i = Add_Chunk(d, off, len, n, mbr, ty, 0, 0); - else if (!strcmp(t, "BSD")) + else if (!strncmp(t, "MBR", 3)) { + switch (ty) { + case 0xa5: + i = Add_Chunk(d, off, len, n, freebsd, ty, 0, 0); + break; + case 0x01: + case 0x04: + case 0x06: + case 0x0b: + case 0x0c: + case 0x0e: + i = Add_Chunk(d, off, len, n, fat, ty, 0, 0); + break; + default: + i = Add_Chunk(d, off, len, n, mbr, ty, 0, 0); + break; + } + } else if (!strcmp(t, "BSD")) i = Add_Chunk(d, off, len, n, part, 0, 0, 0); - else if (!strcmp(t, "PC98") && ty == 0xc494) - i = Add_Chunk(d, off, len, n, freebsd, ty, 0, 0); - else if (!strcmp(t, "PC98")) - i = Add_Chunk(d, off, len, n, pc98, ty, 0, 0); - else if (!strcmp(t, "GPT")) + else if (!strcmp(t, "PC98")) { + switch (ty & 0x7f) { + case 0x14: + i = Add_Chunk(d, off, len, n, freebsd, ty, 0, 0); + break; + case 0x20: + case 0x21: + case 0x22: + case 0x23: + case 0x24: + i = Add_Chunk(d, off, len, n, fat, ty, 0, 0); + break; + default: + i = Add_Chunk(d, off, len, n, pc98, ty, 0, 0); + break; + } + } else if (!strcmp(t, "GPT")) i = Add_Chunk(d, off, len, n, ty, 0, 0, 0); else { printf("BARF %d\n", __LINE__); exit(0); } @@ -503,15 +527,17 @@ { switch (type) { - case 0: + case whole: return "whole"; - case 2: + case fat: return "fat"; - case 3: + case freebsd: switch (subtype) { case 0xc494: return "freebsd"; default: return "unknown"; } + case unused: + return "unused"; default: return "unknown"; } @@ -522,9 +548,9 @@ { switch (type) { - case 0: + case whole: return "whole"; - case 1: + case mbr: switch (subtype) { case 1: return "fat (12-bit)"; case 2: return "XENIX /"; @@ -558,18 +584,18 @@ case 239: return "EFI Sys. Part."; default: return "unknown"; } - case 2: + case fat: return "fat"; - case 3: + case freebsd: switch (subtype) { case 165: return "freebsd"; default: return "unknown"; } - case 4: + case extended: return "extended"; - case 5: + case part: return "part"; - case 6: + case unused: return "unused"; default: return "unknown"; ==== //depot/projects/mips/lib/libdisk/write_alpha_disk.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libdisk/write_alpha_disk.c,v 1.6 2002/11/07 14:39:21 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/write_alpha_disk.c,v 1.7 2002/11/08 13:58:00 jhb Exp $"); #include <stdio.h> #include <stdlib.h> @@ -25,68 +25,60 @@ /* XXX: A lot of hardcoded 512s probably should be foo->sector_size; I'm not sure which, so I leave it like it worked before. --schweikh */ -static int -Write_FreeBSD(int fd, const struct disk *new, const struct disk *old, const struct chunk *c1) +int +Write_Disk(const struct disk *d1) { + u_char buf[BBSIZE]; + char device[64]; + struct chunk *c1; struct disklabel *dl; - int i; void *p; - u_char buf[BBSIZE]; - u_long *lp, sum; + uint64_t *lp, sum; + int fd, i; + + strcpy(device, _PATH_DEV); + strcat(device, d1->name); + + fd = open(device, O_RDWR); + if (fd < 0) + return (1); + + c1 = d1->chunks->part; + if (!strcmp(c1->name, "X") || c1->type != freebsd) { + close (fd); + return (0); + } - for(i = 0; i < BBSIZE/512; i++) { + for (i = 0; i < BBSIZE/512; i++) { p = read_block(fd, i + c1->offset, 512); memcpy(buf + 512 * i, p, 512); free(p); } - if(new->boot1) - memcpy(buf + 512, new->boot1, BBSIZE-512); + if(d1->boot1) + memcpy(buf + 512, d1->boot1, BBSIZE - 512); dl = (struct disklabel *)(buf + 512 * LABELSECTOR + LABELOFFSET); - Fill_Disklabel(dl, new, old, c1); + Fill_Disklabel(dl, d1, NULL, c1); /* * Tell SRM where the bootstrap is. */ lp = (u_long *)buf; - lp[60] = 15; - lp[61] = 1; - lp[62] = 0; + lp[60] = (BBSIZE - 512) / 512; /* Length */ + lp[61] = 1; /* Start */ + lp[62] = 0; /* Flags */ /* * Generate the bootblock checksum for the SRM console. */ - for (lp = (u_long *)buf, i = 0, sum = 0; i < 63; i++) + sum = 0; + for (i = 0; i < 63; i++) sum += lp[i]; lp[63] = sum; - for(i=0;i<BBSIZE/512;i++) { + for (i = 0; i < BBSIZE / 512; i++) write_block(fd, i + c1->offset, buf + 512 * i, 512); - } + close(fd); - return 0; -} - -int -Write_Disk(const struct disk *d1) -{ - char device[64]; - struct chunk *c1; - int fd, ret; - - strcpy(device, _PATH_DEV); - strcat(device, d1->name); - - fd = open(device,O_RDWR); - if (fd < 0) - return (1); - - c1 = d1->chunks->part; - if (!strcmp(c1->name, "X") || c1->type != freebsd) - ret = 0; - else - ret = Write_FreeBSD(fd, d1, NULL, c1); - - close(fd); - return (ret); + return (0); } ==== //depot/projects/mips/lib/libdisk/write_i386_disk.c#2 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libdisk/write_i386_disk.c,v 1.3 2002/10/23 21:05:42 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/write_i386_disk.c,v 1.4 2002/11/08 14:00:44 jhb Exp $"); #include <stdio.h> #include <stdlib.h> @@ -110,7 +110,6 @@ for (c1 = d1->chunks->part; c1; c1 = c1->next) { if (c1->type == unused) continue; if (!strcmp(c1->name, "X")) continue; - j = c1->name[4] - '1'; j = c1->name[strlen(d1->name) + 1] - '1'; if (j < 0 || j > 3) continue; ==== //depot/projects/mips/lib/libdisk/write_pc98_disk.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libdisk/write_pc98_disk.c,v 1.3 2002/10/31 05:38:48 nyan Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/write_pc98_disk.c,v 1.4 2002/11/08 14:49:14 nyan Exp $"); #include <stdio.h> #include <stdlib.h> @@ -99,7 +99,6 @@ for (c1 = d1->chunks->part; c1; c1 = c1->next) { if (c1->type == unused) continue; if (!strcmp(c1->name, "X")) continue; - j = c1->name[4] - '1'; j = c1->name[strlen(d1->name) + 1] - '1'; if (j < 0 || j > 7) continue; ==== //depot/projects/mips/lib/libfetch/fetch.3#2 (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/libfetch/fetch.3,v 1.47 2001/10/01 16:09:15 ru Exp $ +.\" $FreeBSD: src/lib/libfetch/fetch.3,v 1.48 2002/11/08 19:10:05 fenner Exp $ .\" .Dd July 1, 1998 .Dt FETCH 3 @@ -317,7 +317,7 @@ If the .Ql l (low) flag is specified, data sockets will be allocated in the low (or -default) port range instead of the hifh port range (see +default) port range instead of the high port range (see .Xr ip 4 ) . .Pp If the @@ -551,7 +551,7 @@ .%A L. Masinter .%A P. Leach .%A T. Berners-Lee -.%D Januray 1999 +.%D January 1999 .%B Hypertext Transfer Protocol -- HTTP/1.1 .%O RFC2616 .Re ==== //depot/projects/mips/release/alpha/dokern.sh#3 (text+ko) ==== @@ -1,20 +1,25 @@ #!/bin/sh # -# $FreeBSD: src/release/alpha/dokern.sh,v 1.58 2002/11/05 14:44:46 ru Exp $ +# $FreeBSD: src/release/alpha/dokern.sh,v 1.59 2002/11/08 13:58:48 mjacob Exp $ # sed \ -e '/DEC_3000_300/d' \ -e '/DEC_3000_500/d' \ + -e '/DEC_KN8AE/d' \ -e '/SOFTUPDATES/d' \ -e '/UFS_ACL/d' \ -e '/UFS_DIRHASH/d' \ -e '/MFS/d' \ + -e '/NFSCLIENT/d' \ -e '/NFSSERVER/d' \ -e '/NFS_ROOT/d' \ -e '/MSDOSFS/d' \ -e '/PSEUDOFS/d' \ -e '/PROCFS/d' \ + -e '/UFS_DIRHASH/d' \ + -e '/MSDOSFS/d' \ + -e '/CD9660/d' \ -e '/KTRACE/d' \ -e '/SYSV/d' \ -e '/P1003_1B/d' \ @@ -26,7 +31,6 @@ -e '/WITNESS/d' \ -e '/AHC_REG_PRETTY_PRINT/d' \ -e '/AHD_REG_PRETTY_PRINT/d' \ - -e '/COMPAT_FREEBSD4/d' \ -e '/SMP/d' \ -e '/atapifd/d' \ -e '/atapist/d' \ @@ -42,6 +46,7 @@ -e '/ppc/d' \ -e '/ppbus/d' \ -e '/plip/d' \ + -e '/mlx/d' \ -e '/lpt/d' \ -e '/ppi/d' \ -e '/vpo/d' \ @@ -74,12 +79,25 @@ -e '/cue/d' \ -e '/kue/d' \ -e '/maxusers/d' \ + -e '/ahc/d' \ + -e '/mpt.*MPT/d' \ + -e '/txp/d' \ + -e '/dc.*21143/d' \ + -e '/de.*Tulip/d' \ + -e '/fxp/d' \ + -e '/rl.*Real/d' \ + -e '/tl.*Texas/d' \ + -e '/vr.*VIA/d' \ + -e '/xl.*Boom/d' \ + -e '/tun.*unnel/d' \ + -e '/vx.*Vort/d' \ + -e '/ch.*media/d' \ + -e '/miibus/d' \ -e 's/ident.*GENERIC/ident BOOTMFS/g' -echo "options NO_COMPAT_FREEBSD4" - # reset maxusers to something lower -echo "maxusers 5" +echo "maxusers 2" echo "options SCSI_NO_OP_STRINGS" echo "options SCSI_NO_SENSE_STRINGS" +echo "makeoptions NO_MODULES=1" ==== //depot/projects/mips/release/alpha/drivers.conf#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/release/alpha/drivers.conf,v 1.8 2002/11/05 14:44:46 ru Exp $ +# $FreeBSD: src/release/alpha/drivers.conf,v 1.9 2002/11/08 13:58:48 mjacob Exp $ # # drv: driver name in kernel config file # filename: filename of kernel module (without .ko) @@ -36,7 +36,9 @@ # #drv filename floppy type description -de if_de 2 network "DEC DE435 PCI NIC or other DC21040-AA based card" +miibus miibus 2 network "MII bus support" +de if_de 2 network "DEC DEC/Intel 21040, 21041, 21140" +dc if_dc 2 network "DEC DEC/Intel 21143 and workalikes" txp if_txp 2 network "3Com 3XP Typhoon/Sidewinder (3CR990) NIC" vx if_vx 2 network "3Com 3c590 and 3c595 EtherLink III NIC" miibus miibus 2 network "MII bus support" @@ -46,9 +48,11 @@ rl if_rl 2 network "RealTek 8129/8139" tl if_tl 2 network "Texas Instruments ThunderLAN" vr if_vr 2 network "VIA Rhine, Rhine II" -xl if_xl 2 network "3Com 3c90x (``Boomerang'', ``Cyclone'')" -amr amr 3 disk "AMI MegaRAID" -mlx mlx 3 disk "Mylex DAC-family RAID" -ahc ahc 3 disk "AHA2940 and onboard AIC7xxxx devices" -isp isp 3 disk "Qlogic family SCSI" -mpt mpt 3 disk "LSI-Logic MPT-Fusion" +vx if_vx 2 network "3Com 3c590, 3c595 (Vortex)" +xl if_xl 2 network "3Com 3c90x (Boomerang, Cyclone)" + +nfsclient nfsclient 3 options "NFS client support" +amr amr 3 disk "AMI MegaRAID" +mlx mlx 3 disk "Mylex DAC-family RAID" +ispfw ispfw 3 disk "Qlogic SCSI firmware modules" +cd9660 cd9660 3 options "CD9660 filesystem" ==== //depot/projects/mips/release/doc/en_US.ISO8859-1/hardware/Makefile#2 (text+ko) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.4 2002/05/31 18:00:38 nyan Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.5 2002/11/08 18:36:04 bmah Exp $ RELN_ROOT?= ${.CURDIR}/../.. SUBDIR = alpha +SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 SUBDIR+= sparc64 ==== //depot/projects/mips/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml#2 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml,v 1.1 2001/10/29 05:08:52 bmah Exp $ --> +<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml,v 1.2 2002/11/08 18:28:00 bmah Exp $ --> <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"> @@ -20,6 +20,13 @@ <article> &artheader; + + <abstract> + <para>This document is in a very preliminary state. It is + incomplete, and is almost certainly not be an accurate + reflection of reality.</para> + </abstract> + §.intro; §.proc.ia64; §.dev; ==== //depot/projects/mips/release/doc/en_US.ISO8859-1/installation/Makefile#2 (text+ko) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.4 2002/06/03 09:58:44 nyan Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.5 2002/11/08 18:36:04 bmah Exp $ RELN_ROOT?= ${.CURDIR}/../.. SUBDIR = alpha +SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 SUBDIR+= sparc64 ==== //depot/projects/mips/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#3 (text+ko) ==== @@ -1,5 +1,5 @@ <!-- - $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml,v 1.6 2002/10/15 20:54:41 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml,v 1.7 2002/11/08 04:52:04 bmah Exp $ This file contains the comments of the old TROUBLE.TXT file. --> @@ -29,9 +29,9 @@ </sect2> <sect2> - <title>Common Installation Problems, Q&A</title> + <title>Common Installation Problems for &arch.print; Architecture Users</title> - <qandaset> + <qandaset arch="i386"> <qandaentry> <question> <para>I go to boot from the hard disk for the first time @@ -63,14 +63,14 @@ each configured as the master on their respective IDE busses, and wish to boot &os; from the second disk. The BIOS sees these as disk 0 and disk 1, while &os; sees - them as <devicename>wd0</devicename> and - <devicename>wd2</devicename>.</para> + them as <devicename>ad0</devicename> and + <devicename>ad2</devicename>.</para> <para>&os; is on BIOS disk 1, of type - <literal>wd</literal> and the &os; disk number is 2, so + <literal>ad</literal> and the &os; disk number is 2, so you would say:</para> - <screen><userinput>1:wd(2,a)kernel</userinput></screen> + <screen><userinput>1:ad(2,a)kernel</userinput></screen> <para>Note that if you have a slave on the primary bus, the above is not necessary (and is effectively wrong).</para> @@ -134,16 +134,6 @@ </blockquote> </answer> </qandaentry> - </qandaset> - </sect2> - <sect2> - <title>Known Hardware Problems, Q&A</title> - - <note> - <para>Please send hardware tips for this section to &a.jkh;.</para> - </note> - - <qandaset> <qandaentry> <question> <para>The &man.mcd.4; driver keeps thinking that it has @@ -161,54 +151,6 @@ </qandaentry> <qandaentry> <question> - <para>&os; claims to support the 3Com PCMCIA card, but my - card isn't recognized when it's plugged into my - laptop.</para> - </question> - <answer> - <para>There are a couple of possible problems. First of - all, &os; does not support multi-function cards, so if - you have a combo Ethernet/modem card (such as the 3C562), it - won't work. The default driver for the 3C589 card was - written just like all of the other drivers in &os;, and - depend on the card's own configuration data stored in NVRAM - to work. You must correctly configure &os;'s driver to - match the IRQ, port, and IOMEM stored in NVRAM.</para> - - <para>Unfortunately, the only program capable of reading - them is the 3COM supplied DOS program. This program must be - run on a absolutely clean system (no other drivers must be - running), and the program will whine about CARD-Services not - being found, but it will continue. This is necessary to - read the NVRAM values. You want to know the IRQ, port, and - IOMEM values (the latter is called the CIS tuple by 3COM). - The first two can be set in the program, the third is - un-settable, and can only be read. Once you have these - values, set them in UserConfig and your card will be - recognized.</para> - </answer> - </qandaentry> - <qandaentry> - <question> - <para>&os; finds my PCMCIA network card, but no packets - appear to be sent even though it claims to be working.</para> - </question> - <answer> - <para>Many PCMCIA cards have the ability to use either the - 10-Base2 (BNC) or 10-BaseT connectors for connecting to the - network. The driver is unable to <quote>auto-select</quote> - the correct connector, so you must tell it which connector - to use. In order to switch between the two connectors, the - link flags must be set. Depending on the model of the card, - <option>-link0 link1</option> or <option>-link0 - -link1</option> will choose the correct network connector. - You can set these in &man.sysinstall.8; by using the - <literal>Extra options to ifconfig:</literal> field in the - network setup screen.</para> - </answer> - </qandaentry> - <qandaentry> - <question> <para>The system finds my &man.ed.4; network card, but I keep getting device timeout errors.</para> </question> @@ -247,84 +189,6 @@ </qandaentry> <qandaentry> >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211091426.gA9EQfGs073096>