BSD 4_4 release

[unix-history] / usr / src / usr.sbin / config / mkswapconf.c

diff --git a/usr/src/usr.sbin/config/mkswapconf.c b/usr/src/usr.sbin/config/mkswapconf.c
index f4349da..e499973 100644 (file)
--- a/usr/src/usr.sbin/config/mkswapconf.c
+++ b/usr/src/usr.sbin/config/mkswapconf.c
@@ -1,24 +1,38 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)mkswapconf.c       5.8 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)mkswapconf.c       8.1 (Berkeley) 6/6/93";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -63,8 +77,8 @@ do_swap(fl)
                perror(path(swapname));
                exit(1);
        }
                perror(path(swapname));
                exit(1);
        }

-       fprintf(fp, "#include \"../sys/param.h\"\n");
-       fprintf(fp, "#include \"../sys/conf.h\"\n");
+       fprintf(fp, "#include \"sys/param.h\"\n");
+       fprintf(fp, "#include \"sys/conf.h\"\n");

        fprintf(fp, "\n");
        /*
         * If there aren't any swap devices
        fprintf(fp, "\n");
        /*
         * If there aren't any swap devices


@@ -79,19 +93,18 @@ do_swap(fl)
        }
        fprintf(fp, "dev_t\trootdev = makedev(%d, %d);\n",
                major(fl->f_rootdev), minor(fl->f_rootdev));
        }
        fprintf(fp, "dev_t\trootdev = makedev(%d, %d);\n",
                major(fl->f_rootdev), minor(fl->f_rootdev));

-       fprintf(fp, "dev_t\targdev  = makedev(%d, %d);\n",
-               major(fl->f_argdev), minor(fl->f_argdev));

        fprintf(fp, "dev_t\tdumpdev = makedev(%d, %d);\n",
                major(fl->f_dumpdev), minor(fl->f_dumpdev));
        fprintf(fp, "\n");
        fprintf(fp, "struct\tswdevt swdevt[] = {\n");
        do {
                dev = swap->f_swapdev;
        fprintf(fp, "dev_t\tdumpdev = makedev(%d, %d);\n",
                major(fl->f_dumpdev), minor(fl->f_dumpdev));
        fprintf(fp, "\n");
        fprintf(fp, "struct\tswdevt swdevt[] = {\n");
        do {
                dev = swap->f_swapdev;

-               fprintf(fp, "\t{ makedev(%d, %d),\t0,\t%d },\t/* %s */\n",
-                   major(dev), minor(dev), swap->f_swapsize, swap->f_fn);
+               fprintf(fp, "\t{ makedev(%d, %d),\t%d,\t%d },\t/* %s */\n",
+                   major(dev), minor(dev), swap->f_swapflag,
+                   swap->f_swapsize, swap->f_fn);

                swap = swap->f_next;
        } while (swap && swap->f_type == SWAPSPEC);
                swap = swap->f_next;
        } while (swap && swap->f_type == SWAPSPEC);

-       fprintf(fp, "\t{ 0, 0, 0 }\n");
+       fprintf(fp, "\t{ NODEV, 0, 0 }\n");

        fprintf(fp, "};\n");
        fclose(fp);
        return (swap);
        fprintf(fp, "};\n");
        fclose(fp);
        return (swap);