summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1999-04-07 05:58:05 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1999-04-07 05:58:05 +0000
commit083665277fab17fdc382ee38452df0b015d4e6d7 (patch)
tree988ddc90a48b075e47fd73b60a4db9c67046baa0
parent00ec3b1ca380f3871b8965481dff8e0fc1f96ae5 (diff)
cannot swapon in 2.5 installer. the swap partitions must exist at kernel
boot time, the later user-entered disklabel does not take effect correctly. next release...
-rw-r--r--distrib/miniroot/install.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh
index 3f23e31af8b..68a3fbe9eeb 100644
--- a/distrib/miniroot/install.sh
+++ b/distrib/miniroot/install.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: install.sh,v 1.46 1999/04/01 21:24:22 deraadt Exp $
+# $OpenBSD: install.sh,v 1.47 1999/04/07 05:58:04 deraadt Exp $
# $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $
#
# Copyright (c) 1997,1998 Todd Miller, Theo de Raadt
@@ -306,9 +306,10 @@ else
done
fi
-if [ -f /sbin/swapon ]; then
- swapon /dev/${ROOTDISK}b
-fi
+#unfortunately, cannot do this in 2.5
+#if [ -f /sbin/swapon ]; then
+# swapon /dev/${ROOTDISK}b
+#fi
# Get network configuration information, and store it for placement in the
# root filesystem later.