make sure interleave > 0 for cd device

SCCS-vsn: usr.sbin/config/mkioconf.c 8.2

diff --git a/usr/src/usr.sbin/config/mkioconf.c b/usr/src/usr.sbin/config/mkioconf.c
index 6cff0aa..4048493 100644 (file)
--- a/usr/src/usr.sbin/config/mkioconf.c
+++ b/usr/src/usr.sbin/config/mkioconf.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)mkioconf.c 8.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)mkioconf.c 8.2 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <stdio.h>
 #endif /* not lint */
 
 #include <stdio.h>


@@ -1049,7 +1049,8 @@ comp_config(fp)
                if (dp == 0)
                        continue;
                fprintf(fp, "\t%d,\t%d,\t%d,\t%d,\t{",
                if (dp == 0)
                        continue;
                fprintf(fp, "\t%d,\t%d,\t%d,\t%d,\t{",

-                       dp->d_unit, dp->d_pri, dp->d_flags, 1);
+                       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->f_next)
                        fprintf(fp, " 0x%x,", fl->f_compdev);
                fprintf(fp, " NODEV },\n");
                for (fl = fl->f_next; fl->f_type == COMPSPEC; fl = fl->f_next)
                        fprintf(fp, " 0x%x,", fl->f_compdev);
                fprintf(fp, " NODEV },\n");