BSD 4_3_Net_2 release

[unix-history] / usr / src / sys / i386 / i386 / autoconf.c

diff --git a/usr/src/sys/i386/i386/autoconf.c b/usr/src/sys/i386/i386/autoconf.c
index 020f36b..b369d73 100644 (file)
--- a/usr/src/sys/i386/i386/autoconf.c
+++ b/usr/src/sys/i386/i386/autoconf.c
@@ -5,9 +5,35 @@
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
  *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
  *

- * %sccs.include.redist.c%
+ * 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.

  *
  *

- *     @(#)autoconf.c  5.7 (Berkeley) %G%
+ * 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.
+ *
+ *     @(#)autoconf.c  7.1 (Berkeley) 5/9/91

  */
 
 /*
  */
 
 /*


@@ -91,7 +117,7 @@ extern int Maxmem;
                dumplo = 0;
 }
 
                dumplo = 0;
 }
 

-#define        DOSWAP                  /* change swdevt, argdev, and dumpdev too */
+#define        DOSWAP                  /* change swdevt and dumpdev */

 u_long bootdev = 0;            /* should be dev_t, but not until 32 bits */
 
 static char devname[][2] = {
 u_long bootdev = 0;            /* should be dev_t, but not until 32 bits */
 
 static char devname[][2] = {


@@ -151,12 +177,10 @@ setroot()
        if (swp->sw_dev == 0)
                return;
        /*
        if (swp->sw_dev == 0)
                return;
        /*

-        * If argdev and dumpdev were the same as the old primary swap
-        * device, move them to the new primary swap device.
+        * If dumpdev was the same as the old primary swap
+        * device, move it to the new primary swap device.

         */
        if (temp == dumpdev)
                dumpdev = swdevt[0].sw_dev;
         */
        if (temp == dumpdev)
                dumpdev = swdevt[0].sw_dev;

-       if (temp == argdev)
-               argdev = swdevt[0].sw_dev;

 #endif
 }
 #endif
 }