Back out my -k changes; there's a better way to do this in the short-term.

2 files changed, 5 insertions, 14 deletions

diff --git a/sbin/dset/dset.8 b/sbin/dset/dset.8
index 998dcc108848..aeec2edc70c0 100644
--- a/sbin/dset/dset.8
+++ b/sbin/dset/dset.8
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: dset.8,v 1.2 1996/05/02 22:34:19 mpp Exp $
+.\" $Id: dset.8,v 1.3 1996/10/01 14:42:35 jkh Exp $
 .\" "
 .Dd May 2, 1996
 .Dt DSET 8
@@ -34,7 +34,6 @@
 .Sh SYNOPSIS
 .Nm dset
 .Op Fl vqt
-.Op Fl k Ar kernel
 .Sh DESCRIPTION
 .Nm Dset
 records the configuration changes for ISA devices that have been made
@@ -43,10 +42,7 @@ from
 after booting with the
 .Fl c
 option.  The changes (if any) are recorded to the file name returned by
-.Xr getbootfile 3
-unless overridden with the
-.Fl k
-flag.
+.Xr getbootfile 3 .
 .Nm Dset
 is typically called from within
 .Pa /etc/rc .
diff --git a/sbin/dset/dset.c b/sbin/dset/dset.c
index 3c70d1df1120..3961d5539195 100644
--- a/sbin/dset/dset.c
+++ b/sbin/dset/dset.c
@@ -83,7 +83,7 @@ error(name, str)
 void
 usage(char *title)
 {
-	fprintf(stderr, "usage: %s [-qtv] [-k kernel]\n", title);
+	fprintf(stderr, "usage: %s [-qtv]\n", title);
 }
 
 main(ac, av)
@@ -109,7 +109,7 @@ main(ac, av)
 	int             testonly = FALSE;
 	int             verbose = FALSE;
 
-	while ((ch = getopt(ac, av, "qtvk:")) != EOF)
+	while ((ch = getopt(ac, av, "qtv")) != EOF)
 		switch (ch) {
 		case 'q':
 			quiet = TRUE;
@@ -118,10 +118,6 @@ main(ac, av)
 			testonly = TRUE;
 			/* In test mode we want to be verbose */
 
-		case 'k':
-			kernel = optarg;
-			break;
-
 		case 'v':
 			verbose = TRUE;
 			break;
@@ -133,8 +129,7 @@ main(ac, av)
 		}
 
 
-	if (!kernel)
-	    kernel = getbootfile();
+	kernel = getbootfile();
 	if (verbose)
 		printf("Boot image: %s\n", kernel);