NetBSD 1.0 PATCH #1 INDEX DESCRIPTION ----- ----------- patch_01 Fix autoconfiguration bug affecting the hp300. Correct a situation in which config(8) could dump core. Affects: src/sys/arch/hp300/hp300/swapgeneric.c src/usr.sbin/config/mkioconf.c diff -c src/sys/arch/hp300/hp300/swapgeneric.c:1.5 src/sys/arch/hp300/hp300/swapgeneric.c:1.5.2.1 *** src/sys/arch/hp300/hp300/swapgeneric.c:1.5 Mon Nov 7 05:21:08 1994 --- src/sys/arch/hp300/hp300/swapgeneric.c Mon Nov 7 05:21:08 1994 *************** *** 31,37 **** * SUCH DAMAGE. * * from: @(#)swapgeneric.c 7.5 (Berkeley) 5/7/91 ! * $Id: swapgeneric.c,v 1.5 1994/06/24 13:33:49 hpeyerl Exp $ */ #include "sys/param.h" --- 31,37 ---- * SUCH DAMAGE. * * from: @(#)swapgeneric.c 7.5 (Berkeley) 5/7/91 ! * $Id: swapgeneric.c,v 1.5.2.1 1994/11/07 12:52:00 cgd Exp $ */ #include "sys/param.h" *************** *** 51,57 **** int nswap; struct swdevt swdevt[] = { { -1, 1, 0 }, ! { 0, 0, 0 }, }; int dmmin, dmmax, dmtext; --- 51,57 ---- int nswap; struct swdevt swdevt[] = { { -1, 1, 0 }, ! { NODEV, 0, 0 }, }; int dmmin, dmmax, dmtext; diff -c src/usr.sbin/config/mkioconf.c:1.32.2.1 src/usr.sbin/config/mkioconf.c:1.32.2.2 *** src/usr.sbin/config/mkioconf.c:1.32.2.1 Mon Nov 7 05:21:11 1994 --- src/usr.sbin/config/mkioconf.c Mon Nov 7 05:21:12 1994 *************** *** 33,39 **** #ifndef lint /*static char sccsid[] = "from: @(#)mkioconf.c 5.18 (Berkeley) 5/10/91";*/ ! static char rcsid[] = "$Id: mkioconf.c,v 1.32.2.1 1994/08/03 13:26:45 hpeyerl Exp $"; #endif /* not lint */ #include --- 33,39 ---- #ifndef lint /*static char sccsid[] = "from: @(#)mkioconf.c 5.18 (Berkeley) 5/10/91";*/ ! static char rcsid[] = "$Id: mkioconf.c,v 1.32.2.2 1994/11/07 12:52:33 cgd Exp $"; #endif /* not lint */ #include *************** *** 135,141 **** fprintf(fp, "\t%d,\t%d,\t%d,\t%d,\t{", dp->d_unit, dp->d_pri < 0 ? 0 : dp->d_pri, dp->d_flags, 1); ! for (fl = fl->f_next; fl->f_type == COMPSPEC && fl; fl = fl->f_next) fprintf(fp, " 0x%x,", fl->f_compdev); fprintf(fp, " NODEV },\n"); } --- 135,142 ---- fprintf(fp, "\t%d,\t%d,\t%d,\t%d,\t{", dp->d_unit, dp->d_pri < 0 ? 0 : dp->d_pri, dp->d_flags, 1); ! for (fl = fl->f_next; fl && fl->f_type == COMPSPEC; ! fl = fl->f_next) fprintf(fp, " 0x%x,", fl->f_compdev); fprintf(fp, " NODEV },\n"); } END OF NetBSD 1.0 PATCH #1