Date: Sat, 26 Oct 2002 17:30:37 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 20214 for review Message-ID: <200210270030.g9R0UbgO050850@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=20214 Change 20214 by peter@peter_daintree on 2002/10/26 17:30:09 IFC @20213 Affected files ... .. //depot/projects/ia64/UPDATING#21 integrate .. //depot/projects/ia64/contrib/nvi/clib/getopt.c#2 integrate .. //depot/projects/ia64/contrib/nvi/clib/memchr.c#2 integrate .. //depot/projects/ia64/contrib/nvi/clib/memmove.c#2 integrate .. //depot/projects/ia64/contrib/nvi/clib/memset.c#2 integrate .. //depot/projects/ia64/contrib/nvi/clib/mkstemp.c#2 integrate .. //depot/projects/ia64/contrib/nvi/clib/mmap.c#2 integrate .. //depot/projects/ia64/contrib/nvi/clib/snprintf.c#2 integrate .. //depot/projects/ia64/contrib/nvi/clib/strdup.c#2 integrate .. //depot/projects/ia64/contrib/nvi/clib/strerror.c#2 integrate .. //depot/projects/ia64/contrib/nvi/clib/strpbrk.c#2 integrate .. //depot/projects/ia64/contrib/nvi/clib/strsep.c#2 integrate .. //depot/projects/ia64/contrib/nvi/clib/strtol.c#2 integrate .. //depot/projects/ia64/contrib/nvi/clib/strtoul.c#2 integrate .. //depot/projects/ia64/contrib/nvi/clib/vsnprintf.c#2 integrate .. //depot/projects/ia64/lib/libdisk/Makefile#6 integrate .. //depot/projects/ia64/lib/libdisk/disk.c#9 integrate .. //depot/projects/ia64/lib/libdisk/libdisk.h#7 integrate .. //depot/projects/ia64/lib/libdisk/write_ia64_disk.c#4 integrate .. //depot/projects/ia64/usr.sbin/Makefile#24 integrate .. //depot/projects/ia64/usr.sbin/burncd/burncd.c#8 integrate Differences ... ==== //depot/projects/ia64/UPDATING#21 (text+ko) ==== @@ -1004,6 +1004,7 @@ # Note: sometimes if you are running current you gotta do more than # is listed here if you are upgrading from a really old current. + <make sure you have good level 0 dumps> <maybe fix /etc/fstab> [7] make buildworld make buildkernel KERNCONF=YOUR_KERNEL_HERE @@ -1018,6 +1019,16 @@ To upgrade from 4.x-stable to current ------------------------------------- + # 5.x uses more space than 4.x. Also, the location of kernel + # modules has changed. If you are installing 5.0 onto a 4.x + # system, you'll need about 30MB of free disk space on your / + # partition. If you have less than this, you may encounter difficult + # to back out of problems with this proceedure. If /tmp is on + # the / partition, you may want to completely remove all its content + # before upgrading, as this can be a common source of shortage of + # space on /. + + <make sure you have good level 0 dumps> <maybe fix /etc/fstab> [7] make buildworld make buildkernel KERNCONF=YOUR_KERNEL_HERE @@ -1125,4 +1136,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.220 2002/10/26 06:25:11 imp Exp $ +$FreeBSD: src/UPDATING,v 1.222 2002/10/26 22:55:43 imp Exp $ ==== //depot/projects/ia64/contrib/nvi/clib/getopt.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/nvi/clib/memchr.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/nvi/clib/memmove.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/nvi/clib/memset.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/nvi/clib/mkstemp.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/nvi/clib/mmap.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/nvi/clib/snprintf.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/nvi/clib/strdup.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/nvi/clib/strerror.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/nvi/clib/strpbrk.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/nvi/clib/strsep.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/nvi/clib/strtol.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/nvi/clib/strtoul.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/nvi/clib/vsnprintf.c#2 (text+ko) ==== ==== //depot/projects/ia64/lib/libdisk/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libdisk/Makefile,v 1.34 2002/10/23 20:02:33 phk Exp $ +# $FreeBSD: src/lib/libdisk/Makefile,v 1.35 2002/10/27 00:21:02 peter Exp $ LIB= disk SRCS= blocks.c chunk.c disk.c change.c \ ==== //depot/projects/ia64/lib/libdisk/disk.c#9 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.93 2002/10/24 13:35:52 gallatin Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.94 2002/10/27 00:21:02 peter Exp $"); #include <stdio.h> #include <stdlib.h> @@ -781,7 +781,7 @@ #elif defined(__ia64__) printf("\n"); #else -#error "Debug_Disk: unknown arch"; +/* Should be: error "Debug_Disk: unknown arch"; */ #endif Debug_Chunk(d->chunks); } @@ -940,7 +940,7 @@ #elif defined(__ia64__) /* nothing */ #else -#error "Set_Boot_Blocks: unknown arch" +/* Should be: #error "Set_Boot_Blocks: unknown arch"; */ #endif return 0; } ==== //depot/projects/ia64/lib/libdisk/libdisk.h#7 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * -* $FreeBSD: src/lib/libdisk/libdisk.h,v 1.47 2002/10/23 21:05:42 phk Exp $ +* $FreeBSD: src/lib/libdisk/libdisk.h,v 1.48 2002/10/27 00:21:02 peter Exp $ * */ ==== //depot/projects/ia64/lib/libdisk/write_ia64_disk.c#4 (text+ko) ==== ==== //depot/projects/ia64/usr.sbin/Makefile#24 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.236 2002/10/25 17:04:49 phk Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.237 2002/10/27 00:22:05 peter Exp $ # XXX MISSING: mkproto SUBDIR= IPXrouted \ ==== //depot/projects/ia64/usr.sbin/burncd/burncd.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/usr.sbin/burncd/burncd.c,v 1.27 2002/10/18 22:03:39 njl Exp $ + * $FreeBSD: src/usr.sbin/burncd/burncd.c,v 1.28 2002/10/26 23:32:35 njl Exp $ */ #include <unistd.h> @@ -119,7 +119,7 @@ if (strcasecmp("max", optarg) == 0) speed = CDR_MAX_SPEED; else - speed = atoi(optarg); + speed = atoi(optarg) * 177; if (speed <= 0) errx(EX_USAGE, "Invalid speed: %s", optarg); break; 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?200210270030.g9R0UbgO050850>