From owner-p4-projects Sat Oct 26 14: 8:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E44C237B404; Sat, 26 Oct 2002 14:08:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8F00F37B401 for ; Sat, 26 Oct 2002 14:08:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB69743E7B for ; Sat, 26 Oct 2002 14:08:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9QL7KmV024539 for ; Sat, 26 Oct 2002 14:07:20 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9QL7JRR024536 for perforce@freebsd.org; Sat, 26 Oct 2002 14:07:19 -0700 (PDT) Date: Sat, 26 Oct 2002 14:07:19 -0700 (PDT) Message-Id: <200210262107.g9QL7JRR024536@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 20204 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20204 Change 20204 by rwatson@rwatson_tislabs on 2002/10/26 14:06:22 Integ the TrustedBSD MAC tree from the TrustedBSD base tree: loop back VFS label changes. Affected files ... .. //depot/projects/trustedbsd/mac/Makefile.inc1#26 integrate .. //depot/projects/trustedbsd/mac/UPDATING#17 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-format.c#6 integrate .. //depot/projects/trustedbsd/mac/etc/dm.conf#3 delete .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.local.dist#8 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.usr.dist#17 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ipnat#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/sysctl#6 integrate .. //depot/projects/trustedbsd/mac/include/pthread_np.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/gethostbydns.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_attr_get_np.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_attr_get_np.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_create.c#5 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#31 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/early-adopter/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/readme/article.sgml#7 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#41 integrate .. //depot/projects/trustedbsd/mac/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml#4 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/examples/Makefile.relnotesng#4 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.8#13 integrate .. //depot/projects/trustedbsd/mac/share/colldef/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/share/colldef/lt_LT.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/mac/share/colldef/map.ISO8859-13#1 branch .. //depot/projects/trustedbsd/mac/share/mklocale/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/share/mklocale/lt_LT.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/mac/share/monetdef/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/share/monetdef/lt_LT.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/mac/share/msgdef/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/share/msgdef/lt_LT.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/mac/share/numericdef/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/share/numericdef/lt_LT.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/mac/share/timedef/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/share/timedef/lt_LT.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/mac/sys/alpha/include/alpha_cpu.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/atomic.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#67 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.pc98#16 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_examine.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ciss/ciss.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/gem/if_gem.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/rc/rc.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/tx/if_tx.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/tx/if_txvar.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vnops.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vnops.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_disk.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_kern.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_mbr.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_pc98.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_slice.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/proc.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/conf/GENERIC#17 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#332 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sysctl.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_thread.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_prf.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_trap.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#47 integrate .. //depot/projects/trustedbsd/mac/sys/modules/procfs/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/i386/machdep.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#161 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#133 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#92 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#66 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/conf/GENERIC#22 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/exception.S#8 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/trap.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#196 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#150 integrate .. //depot/projects/trustedbsd/mac/sys/sys/proc.h#29 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#59 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/Makefile#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-btowc.c#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbrlen.c#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbrtowc.c#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbsrtowcs.c#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wcrtomb.c#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wcsrtombs.c#1 branch Differences ... ==== //depot/projects/trustedbsd/mac/Makefile.inc1#26 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.306 2002/10/22 08:30:31 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.307 2002/10/25 19:15:29 peter Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -356,6 +356,13 @@ false; \ fi .endif +.if ${TARGET_ARCH} == ${MACHINE_ARCH} && \ + (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/") + @echo "Checking to see if your booted kernel is fresh enough.." + ${.OBJDIR}/bin/sh/sh -c \ + 'echo "Testing installed kernel for new sigaction(2) syscall"' + @echo "Seems ok.." +.endif # # distributeworld ==== //depot/projects/trustedbsd/mac/UPDATING#17 (text+ko) ==== @@ -17,10 +17,13 @@ developers choose to disable these features on build machines to maximize performance. - In addition, IDE write caching is currently disabled by default - due to on-going concerns about disk write order and file system - integrity. Re-enabling write caching can substantially improve - performance. +20021024: + Old, compatibility slices have been removed in GEOM kernels. This + means that you will have to update your /etc/fstab to not use + disk devices of the form /dev/ad0a. Instead, you now must + specify /dev/ad0s1a, or whatever slice your FreeBSD partition + really is on. The old device names have gone away, so if you + use them anywhere else, you must also adjust those uses. 20021023: Alphas with kernels from between 20020830 and 20021023 and/or @@ -998,21 +1001,35 @@ To rebuild everything and install it on the current system. ----------------------------------------------------------- - make world - Build a new kernel, see above. + # Note: sometimes if you are running current you gotta do more than + # is listed here if you are upgrading from a really old current. + + [7] + make buildworld + make buildkernel KERNCONF=YOUR_KERNEL_HERE + make installkernel KERNCONF=YOUR_KERNEL_HERE + [1] + [3] + mergemaster -p [5] + make installworld + mergemaster [4] + + To upgrade from 4.x-stable to current ------------------------------------- + [7] make buildworld make buildkernel KERNCONF=YOUR_KERNEL_HERE cp src/sys/${MACHINE_ARCH}/conf/GENERIC.hints /boot/device.hints [2] make installkernel KERNCONF=YOUR_KERNEL_HERE - reboot in single user [3] - mergemaster -p [5] + cd src/sys/boot ; make install [6] + [1] + [3] + mergemaster -p [5] rm -rf /usr/include/g++ make installworld - mergemaster [4] - [1] + mergemaster [4] Make sure that you've read the UPDATING file to understand the @@ -1058,6 +1075,23 @@ install) after the buildworld before this step if you last updated from current before 20020224 or from -stable before 20020408. + [6] 4.x boot blocks can be used to boot a 5.x system, however + it is difficult to do that at best. If you are concerned + about being able to boot 4.x if the reboot to single user + fails, then you should do something like + mv /boot /boot-4x + mkdir /boot + before this step. You may be able to then boot the 4.x boot + blocks if you catch boot2, and enter /boot-4x/loader rather than + /boot/loader. However, this step hasn't been torture tested. + + [7] Before you upgrade, please make sure that you are not using + compatibility slices. These are device names of the form, on i386 + and other architectures that use MBR slicing, /dev/ad0a without the + actual slice name. Chances are excellent that these will break. + You generally must update these entries to use the post FreeBSD + 2.x form of /dev/ad0s1a. + FORMAT: This file contains a list, in reverse chronological order, of major @@ -1091,4 +1125,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.218 2002/10/24 18:41:02 gallatin Exp $ +$FreeBSD: src/UPDATING,v 1.220 2002/10/26 06:25:11 imp Exp $ ==== //depot/projects/trustedbsd/mac/contrib/gcc/c-format.c#6 (text+ko) ==== @@ -19,7 +19,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/c-format.c,v 1.5 2002/07/12 00:49:52 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/c-format.c,v 1.6 2002/10/25 19:41:32 mux Exp $ */ #include "config.h" #include "system.h" @@ -798,7 +798,7 @@ */ { "D", 1, STD_EXT, { T89_C, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "cR" }, { "b", 1, STD_EXT, { T89_C, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "" }, - { "rz", 0, STD_EXT, { T89_I, BADLEN, BADLEN, T89_L, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0 +#", "i" }, + { "ry", 0, STD_EXT, { T89_I, BADLEN, BADLEN, T89_L, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0 +#", "i" }, { NULL, 0, 0, NOLENGTHS, NULL, NULL } }; ==== //depot/projects/trustedbsd/mac/etc/mtree/BSD.local.dist#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.91 2002/10/19 12:56:56 ache Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.92 2002/10/25 22:00:34 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -357,6 +357,8 @@ .. la_LN.US-ASCII .. + lt_LT.ISO8859-13 + .. lt_LT.ISO8859-4 .. nl_BE.ISO8859-1 ==== //depot/projects/trustedbsd/mac/etc/mtree/BSD.usr.dist#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.267 2002/10/20 11:18:56 markm Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.268 2002/10/25 22:00:34 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -453,6 +453,8 @@ .. la_LN.US-ASCII .. + lt_LT.ISO8859-13 + .. lt_LT.ISO8859-4 .. nl_BE.ISO8859-1 @@ -777,6 +779,8 @@ .. la_LN.US-ASCII .. + lt_LT.ISO8859-13 + .. lt_LT.ISO8859-4 .. nl_BE.ISO8859-1 ==== //depot/projects/trustedbsd/mac/etc/rc.d/ipnat#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipnat,v 1.6 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipnat,v 1.4 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/ipnat,v 1.5 2002/10/26 00:18:06 fenner Exp $ # # PROVIDE: ipnat @@ -36,8 +36,7 @@ { # Make sure ipfilter is loaded before continuing if ! ${SYSCTL} net.inet.ipf.fr_pass >/dev/null 2>&1; then - err 'ipnat requires ipfilter be loaded' - return 1 + err 1 'ipnat requires ipfilter be loaded' fi return 0 } ==== //depot/projects/trustedbsd/mac/etc/rc.d/sysctl#6 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: sysctl,v 1.12 2002/04/29 12:10:23 lukem Exp $ -# $FreeBSD: src/etc/rc.d/sysctl,v 1.10 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/sysctl,v 1.11 2002/10/25 23:02:54 fenner Exp $ # # PROVIDE: sysctl @@ -49,8 +49,8 @@ sysctl ${var} ;; esac - elif [ "$1" -eq "last" ]; then - warn "sysctl ${mib} does not exits." + elif [ "$1" = "last" ]; then + warn "sysctl ${mib} does not exist." fi ;; esac ==== //depot/projects/trustedbsd/mac/include/pthread_np.h#5 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/pthread_np.h,v 1.13 2002/10/22 17:11:49 fjoe Exp $ + * $FreeBSD: src/include/pthread_np.h,v 1.14 2002/10/26 13:58:12 phantom Exp $ */ #ifndef _PTHREAD_NP_H_ #define _PTHREAD_NP_H_ @@ -44,6 +44,7 @@ */ __BEGIN_DECLS int pthread_attr_setcreatesuspend_np(pthread_attr_t *); +int pthread_attr_get_np(pthread_t *, pthread_attr_t *); int pthread_main_np(void); int pthread_multi_np(void); int pthread_mutexattr_getkind_np(pthread_mutexattr_t); ==== //depot/projects/trustedbsd/mac/lib/libc/net/gethostbydns.c#7 (text+ko) ==== @@ -58,7 +58,7 @@ static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.40 2002/10/03 17:25:33 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.41 2002/10/26 19:00:14 ume Exp $"); #include #include @@ -674,7 +674,7 @@ uaddr[n] & 0xf, (uaddr[n] >> 4) & 0xf)); } - strcpy(qp, "ip6.int"); + strlcat(qbuf, "ip6.arpa", sizeof(qbuf)); break; default: abort(); @@ -684,6 +684,12 @@ return NS_NOTFOUND; } n = res_query(qbuf, C_IN, T_PTR, (u_char *)buf->buf, sizeof buf->buf); + if (n < 0 && af == AF_INET6) { + *qp = '\0'; + strlcat(qbuf, "ip6.int", sizeof(qbuf)); + n = res_query(qbuf, C_IN, T_PTR, (u_char *)buf->buf, + sizeof buf->buf); + } if (n < 0) { free(buf); dprintf("res_query failed (%d)\n", n); ==== //depot/projects/trustedbsd/mac/lib/libc_r/man/Makefile.inc#2 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/lib/libc_r/man/Makefile.inc,v 1.15 2001/07/20 04:23:09 jasone Exp $ +# $FreeBSD: src/lib/libc_r/man/Makefile.inc,v 1.16 2002/10/26 15:04:29 phantom Exp $ # POSIX thread man files .PATH: ${.CURDIR}/man MAN+= pthread_attr.3 \ + pthread_attr_get_np.3 \ pthread_cancel.3 \ pthread_cleanup_pop.3 \ pthread_cleanup_push.3 \ ==== //depot/projects/trustedbsd/mac/lib/libc_r/uthread/Makefile.inc#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.33 2002/06/28 13:26:02 deischen Exp $ +# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.34 2002/10/26 13:55:35 phantom Exp $ # uthread sources .PATH: ${.CURDIR}/uthread @@ -20,6 +20,7 @@ uthread_attr_getscope.c \ uthread_attr_getstackaddr.c \ uthread_attr_getstacksize.c \ + uthread_attr_get_np.c \ uthread_attr_setcreatesuspend_np.c \ uthread_attr_setdetachstate.c \ uthread_attr_setguardsize.c \ ==== //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_create.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_create.c,v 1.34 2002/07/09 13:24:52 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_create.c,v 1.35 2002/10/26 13:47:06 phantom Exp $ */ #include #include @@ -59,7 +59,7 @@ __weak_reference(_pthread_create, pthread_create); int -_pthread_create(pthread_t * thread, const pthread_attr_t * attr, +_pthread_create(pthread_t *thread, const pthread_attr_t *attr, void *(*start_routine) (void *), void *arg) { struct pthread *curthread = _get_curthread(); @@ -71,6 +71,9 @@ pthread_attr_t pattr; void *stack; + if (thread == NULL) + return(EINVAL); + /* * Locking functions in libc are required when there are * threads other than the initial thread. ==== //depot/projects/trustedbsd/mac/release/Makefile#31 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.715 2002/10/24 07:35:30 nyan Exp $ +# $FreeBSD: src/release/Makefile,v 1.716 2002/10/26 04:48:55 bmah Exp $ # # make release CHROOTDIR=/some/dir BUILDNAME=somename CVSROOT=/cvs/dir \ # [ RELEASETAG=tag ] @@ -124,7 +124,7 @@ AUTO_KEYBOARD_DETECT?= 0 .if !defined(NODOC) -DIST_DOCS_ARCH_INDEP= readme errata +DIST_DOCS_ARCH_INDEP= readme errata early-adopter DIST_DOCS_ARCH_DEP= installation relnotes hardware .endif @@ -644,6 +644,7 @@ cp ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.txt ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \ done @mv ${RD}/mfsfd/stand/help/INSTALLATION.TXT ${RD}/mfsfd/stand/help/INSTALL.TXT + @mv ${RD}/mfsfd/stand/help/EARLY-ADOPTER.TXT ${RD}/mfsfd/stand/help/EARLY.TXT .endif -test -f ${.CURDIR}/install.cfg && cp ${.CURDIR}/install.cfg ${RD}/mfsfd @mkdir -p ${RD}/mfsfd/boot @@ -762,6 +763,8 @@ @cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${FD} @mv ${FD}/INSTALLATION.TXT ${FD}/INSTALL.TXT @mv ${FD}/INSTALLATION.HTM ${FD}/INSTALL.HTM + @mv ${FD}/EARLY-ADOPTER.TXT ${FD}/EARLY.TXT + @mv ${FD}/EARLY-ADOPTER.HTM ${FD}/EARLY.HTM .endif @echo "CD_VERSION = ${BUILDNAME}" > ${FD}/cdrom.inf .if !defined(NOPORTS) @@ -801,6 +804,8 @@ @cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${CD_DISC1} @mv ${CD_DISC1}/INSTALLATION.TXT ${CD_DISC1}/INSTALL.TXT @mv ${CD_DISC1}/INSTALLATION.HTM ${CD_DISC1}/INSTALL.HTM + @mv ${CD_DISC1}/EARLY-ADOPTER.TXT ${CD_DISC1}/EARLY.TXT + @mv ${CD_DISC1}/EARLY-ADOPTER.HTM ${CD_DISC1}/EARLY.HTM .endif .if ${TARGET} != "pc98" @echo "Setting up /boot" ==== //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/Makefile,v 1.2 2001/04/29 21:04:58 dd Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/Makefile,v 1.3 2002/10/25 21:58:06 bmah Exp $ RELN_ROOT?= ${.CURDIR}/.. @@ -7,6 +7,7 @@ SUBDIR+= readme SUBDIR+= errata SUBDIR+= installation +SUBDIR+= early-adopter COMPAT_SYMLINK = en ==== //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/readme/article.sgml#7 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.17 2002/03/30 17:34:31 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.18 2002/10/26 17:00:39 bmah Exp $ 2000 @@ -277,6 +277,13 @@ + EARLY.TXT: A guide for early + adopters of &os; 5.0-RELEASE. Highly recommended + reading for users new to &os; &release.branch; and/or the + 5.X series of releases. + + + RELNOTES.TXT: The release notes, showing what's new and different in &os; &release.current; compared to the previous release (&os; ==== //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#41 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.440 2002/10/25 03:50:41 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.442 2002/10/26 17:27:35 bmah Exp $ 2000 @@ -1312,7 +1312,22 @@ The &man.geom.4; disk I/O request transformation framework has been added; this extensible framework is designed to support a wide variety of operations on I/O requests on their - way from the upper kernel to the device drivers. + way from the upper kernel to the device drivers. + + + GEOM-enabled kernels no longer support + compatability slices. This feature + (supported on the i386 and pc98 only) allowed a user to + refer to a disk partition without specifying an MBR slice + (e.g. /dev/ad0a); the kernel would + automatically find the first applicable &os; slice and use + it. On GEOM kernels, only the full partition names + (e.g. /dev/ad0s1a) are allowed when + referring to partitions within MBR slices. This + change should affect very few users. + + + A GEOM Based Disk Encryption module has been added. It provides denial of access to cold disks, with @@ -4500,53 +4515,15 @@ Upgrading from previous releases of &os; - If you're upgrading from a previous release of &os;, you - generally will have three options: - - - - Using the binary upgrade option of &man.sysinstall.8;. - This option is perhaps the quickest, although it presumes - that your installation of &os; uses no special compilation - options. - - - Performing a complete reinstall of &os;. Technically, - this is not an upgrading method, and in any case is usually less - convenient than a binary upgrade, in that it requires you to - manually backup and restore the contents of - /etc. However, it may be useful in - cases where you want (or need) to change the partitioning of - your disks. - - - From source code in /usr/src. This - route is more flexible, but requires more disk space, time, - and technical expertise. More information can be found - in the Using - make world section of the FreeBSD - Handbook. Upgrading from very old - versions of &os; may be problematic; in cases like this, it - is usually more effective to perform a binary upgrade or a - complete reinstall. - - - - - Please read the INSTALL.TXT file for more - information, preferably before beginning an - upgrade. If you are upgrading from source, please be sure to read - /usr/src/UPDATING as well. - - Finally, if you want to use one of various means to track the - -STABLE or -CURRENT branches of &os;, please be sure to consult - the -CURRENT - vs. -STABLE section of the FreeBSD - Handbook. + Users with existing &os; systems are + highly encouraged to read the Early + Adopter's Guide to &os; 5.0. This document generally has + the filename EARLY.TXT on the distribution + media, or any other place that the release notes can be found. It + offers some notes on upgrading, but more importantly, also + discusses some of the relative merits of upgrading to &os; + 5.X versus running &os; + 4.X. Upgrading &os; should, of course, only be attempted after ==== //depot/projects/trustedbsd/mac/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml#4 (text+ko) ==== @@ -3,8 +3,8 @@ The FreeBSD French Documentation Project $Id: dev.sgml,v 1.3 2002/09/29 21:03:53 eagle Exp $ - $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml,v 1.4 2002/10/19 16:26:21 gioria Exp $ - Original revision: 1.106 + $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml,v 1.5 2002/10/26 12:36:38 gioria Exp $ + Original revision: 1.111 -->