diff options
author | phk <phk@FreeBSD.org> | 1994-10-21 03:17:11 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1994-10-21 03:17:11 +0000 |
commit | 2cf5e51b10ea71a17569a2a0c7c898f9eb6934ef (patch) | |
tree | 63d5d4f50993b84f49b249ed0591447460bec65c | |
parent | 2714516b29c959ae72c1898de2ccc2a1908b807d (diff) | |
download | FreeBSD-src-2cf5e51b10ea71a17569a2a0c7c898f9eb6934ef.zip FreeBSD-src-2cf5e51b10ea71a17569a2a0c7c898f9eb6934ef.tar.gz |
ATTENTION!
From now on, >all< swapdevices must be activated with "swapon".
If you havn't got it, add this line to /etc/fstab:
/dev/wd0b none swap sw 0 0
ne sec
Reason:
We want our GENERIC* kernels to have a large selection of swap-devices, but
on the other hand, we don't want to use a wd0b as swap when we boot of a
floppy. This way, we will never use a unexpected swapdevice. Nothing else
has changed.
-rw-r--r-- | sys/vm/vm_swap.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c index 4a92f37..c6dc662 100644 --- a/sys/vm/vm_swap.c +++ b/sys/vm/vm_swap.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm_swap.c 8.5 (Berkeley) 2/17/94 - * $Id: vm_swap.c,v 1.7 1994/10/09 01:52:18 phk Exp $ + * $Id: vm_swap.c,v 1.8 1994/10/09 07:35:18 davidg Exp $ */ #include <sys/param.h> @@ -136,17 +136,12 @@ swapinit() panic("swapvp"); #endif /* - * If there is no swap configured, tell the user. If there is, - * try to make swap on boot device available now. If this fails, - * no swap space is available there or it isn't configured. + * If there is no swap configured, tell the user. We don't activate + * any swapspaces in the kernel. The user must explicitly use swapon + * to tell start each device. */ if (nswap == 0) printf("WARNING: no swap space found\n"); - else { - error = swfree(p, 0); - if (error) - printf("WARNING: no swap on boot device - use swapon\n"); - } } void |