summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Weingartner <weingart@cvs.openbsd.org>1999-05-24 17:02:32 +0000
committerTobias Weingartner <weingart@cvs.openbsd.org>1999-05-24 17:02:32 +0000
commit9adf18635eea0e9d8af9366a8cc15a661b5dd090 (patch)
treea188e514763bc979204c5857a1b8d9052bdb189f
parent9dc533e86249c03ccbfc2fd0081161af2eb16fd7 (diff)
bye-bye, swapctl does the same thing.
-rw-r--r--sbin/swapon/Makefile6
-rw-r--r--sbin/swapon/swapon.895
-rw-r--r--sbin/swapon/swapon.c131
3 files changed, 0 insertions, 232 deletions
diff --git a/sbin/swapon/Makefile b/sbin/swapon/Makefile
deleted file mode 100644
index 319c444742a..00000000000
--- a/sbin/swapon/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $OpenBSD: Makefile,v 1.3 1997/09/21 11:38:18 deraadt Exp $
-
-PROG= swapon
-MAN= swapon.8
-
-.include <bsd.prog.mk>
diff --git a/sbin/swapon/swapon.8 b/sbin/swapon/swapon.8
deleted file mode 100644
index 48441b3d3ed..00000000000
--- a/sbin/swapon/swapon.8
+++ /dev/null
@@ -1,95 +0,0 @@
-.\" $OpenBSD: swapon.8,v 1.8 1999/05/23 14:11:22 aaron Exp $
-.\" $NetBSD: swapon.8,v 1.8 1995/08/18 14:51:35 pk Exp $
-.\"
-.\" Copyright (c) 1980, 1991, 1993
-.\" The Regents of the University of California. All rights reserved.
-.\"
-.\" 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.
-.\"
-.\" @(#)swapon.8 8.1 (Berkeley) 6/5/93
-.\"
-.Dd June 5, 1993
-.Dt SWAPON 8
-.Os
-.Sh NAME
-.Nm swapon
-.Nd "specify additional device for paging and swapping"
-.Sh SYNOPSIS
-.Nm swapon
-.Fl a
-.Nm swapon
-.Ar special_file ...
-.Sh DESCRIPTION
-.Nm
-is used to specify additional devices on which paging and swapping
-are to take place.
-The system begins by swapping and paging on only a single device
-so that only one disk is required at bootstrap time.
-Calls to
-.Nm
-normally occur in the system multi-user initialization file
-.Pa /etc/rc
-making all swap devices available, so that the paging and swapping
-activity is interleaved across several devices.
-.Pp
-Normally, the first form is used:
-.Bl -tag -width Ds
-.It Fl a
-All devices marked as
-.Dq sw
-swap devices in
-.Pa /etc/fstab
-are made available.
-.El
-.Pp
-The second form gives individual block devices as given
-in the system swap configuration table. The call makes only this space
-available to the system for swap allocation.
-.Sh FILES
-.Bl -tag -width /dev/[ru][pk]?b -compact
-.It Pa /dev/[ru][pk]?b
-standard paging devices
-.It Pa /etc/fstab
-ASCII filesystem description table
-.El
-.Sh SEE ALSO
-.Xr swapon 2 ,
-.Xr fstab 5 ,
-.Xr init 8 ,
-.Xr rc 8 ,
-.Xr vnconfig 8
-.Sh BUGS
-There is no way to stop paging and swapping on a device.
-It is therefore not possible to make use of devices which may be
-dismounted during system operation.
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 4.0 .
diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c
deleted file mode 100644
index 67ff245d27b..00000000000
--- a/sbin/swapon/swapon.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/* $OpenBSD: swapon.c,v 1.5 1997/09/04 00:51:55 mickey Exp $ */
-/* $NetBSD: swapon.c,v 1.7 1995/03/18 15:01:18 cgd Exp $ */
-
-/*
- * Copyright (c) 1980, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * 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
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)swapon.c 8.1 (Berkeley) 6/5/93";
-#else
-static char rcsid[] = "$OpenBSD: swapon.c,v 1.5 1997/09/04 00:51:55 mickey Exp $";
-#endif
-#endif /* not lint */
-
-#include <fstab.h>
-#include <errno.h>
-#include <err.h>
-#include <stdio.h>
-#include <unistd.h>
-
-int add __P((char *, int));
-void usage ();
-extern char *__progname;
-
-int
-main(argc, argv)
- int argc;
- char **argv;
-{
- extern int optind;
- register struct fstab *fsp;
- register int stat;
- int ch, doall;
-
- doall = 0;
- while ((ch = getopt(argc, argv, "a")) != -1)
- switch((char)ch) {
- case 'a':
- doall = 1;
- break;
- case '?':
- default:
- usage();
- }
- argv += optind;
-
- stat = 0;
- if (doall)
- while ((fsp = getfsent())) {
- if (strcmp(fsp->fs_type, FSTAB_SW))
- continue;
- if (add(fsp->fs_spec, 1))
- stat = 1;
- else
- printf("%s: adding %s as swap device\n",
- __progname, fsp->fs_spec);
- }
- else if (!*argv)
- usage();
- for (; *argv; ++argv)
- stat |= add(*argv, 0);
- exit(stat);
-}
-
-int
-add(name, ignoreebusy)
- char *name;
- int ignoreebusy;
-{
- extern int errno;
-
- if (swapon(name) == -1) {
- switch (errno) {
- case EINVAL:
- warnx("%s: Device not configured", name);
- break;
- case EBUSY:
- if (!ignoreebusy)
- warnx("%s: Device already in use", name);
- break;
- default:
- warn("%s", name);
- break;
- }
- return(1);
- }
- return(0);
-}
-
-void
-usage()
-{
- fprintf(stderr, "usage: %s [-a] [special_file ...]\n", __progname);
- exit(1);
-}