summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2019-08-11 17:08:34 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2019-08-11 17:08:34 +0000
commit47a4c7cf1568fdc84047fea921e24760963c88d0 (patch)
tree4bad6f1267ae797b67eccb07d04bc7c6ee72de2b
parent5f1862e5ac564145c5ee9b4a59dcef12cf60e863 (diff)
delete the bufcachepercent command (since this can be done at runtime),
and leftovers from past commands shmseg/shmmaxpg/nmbclusters ok kettenis
-rw-r--r--usr.sbin/config/cmd.c11
-rw-r--r--usr.sbin/config/cmd.h6
-rw-r--r--usr.sbin/config/config.87
-rw-r--r--usr.sbin/config/ukc.c3
-rw-r--r--usr.sbin/config/ukc.h12
5 files changed, 8 insertions, 31 deletions
diff --git a/usr.sbin/config/cmd.c b/usr.sbin/config/cmd.c
index 4d2266efdab..5b611b084c8 100644
--- a/usr.sbin/config/cmd.c
+++ b/usr.sbin/config/cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.c,v 1.20 2013/11/23 17:38:15 deraadt Exp $ */
+/* $OpenBSD: cmd.c,v 1.21 2019/08/11 17:08:33 deraadt Exp $ */
/*
* Copyright (c) 1999-2001 Mats O Jansson. All rights reserved.
@@ -58,8 +58,6 @@ cmd_table_t cmd_table[] = {
{"exit", Xexit, "", "Exit, without saving changes"},
{"quit", Xquit, "", "Quit, saving current changes"},
{"timezone", Xtimezone, "[mins [dst]]", "Show/change timezone"},
- {"bufcachepercent", Xbufcachepct, "[number]",
- "Show/change BUFCACHEPERCENT"},
{"nkmempg", Xnkmempg, "[number]", "Show/change NKMEMPAGES"},
{NULL, NULL, NULL, NULL}
};
@@ -303,13 +301,6 @@ int_variable_adjust(const cmd_t *cmd, int idx, const char *name)
}
int
-Xbufcachepct(cmd_t *cmd)
-{
- int_variable_adjust(cmd, I_BUFCACHEPCT, "bufcachepercent");
- return (CMD_CONT);
-}
-
-int
Xnkmempg(cmd_t *cmd)
{
int_variable_adjust(cmd, I_NKMEMPG, "nkmempages");
diff --git a/usr.sbin/config/cmd.h b/usr.sbin/config/cmd.h
index 27fb528da12..be476743c64 100644
--- a/usr.sbin/config/cmd.h
+++ b/usr.sbin/config/cmd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.h,v 1.7 2003/06/03 00:52:35 weingart Exp $ */
+/* $OpenBSD: cmd.h,v 1.8 2019/08/11 17:08:33 deraadt Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -67,11 +67,7 @@ int Xshow(cmd_t *);
int Xexit(cmd_t *);
int Xquit(cmd_t *);
int Xtimezone(cmd_t *);
-int Xnmbclusters(cmd_t *);
-int Xbufcachepct(cmd_t *);
int Xnkmempg(cmd_t *);
-int Xshmseg(cmd_t *);
-int Xshmmaxpgs(cmd_t *);
#endif /* _CMD_H */
diff --git a/usr.sbin/config/config.8 b/usr.sbin/config/config.8
index a681100deba..7cdf1870ebd 100644
--- a/usr.sbin/config/config.8
+++ b/usr.sbin/config/config.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: config.8,v 1.68 2019/07/19 20:40:44 schwarze Exp $
+.\" $OpenBSD: config.8,v 1.69 2019/08/11 17:08:33 deraadt Exp $
.\" $NetBSD: config.8,v 1.10 1996/08/31 20:58:16 mycroft Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
.\"
.\" from: @(#)config.8 8.2 (Berkeley) 4/19/94
.\"
-.Dd $Mdocdate: July 19 2019 $
+.Dd $Mdocdate: August 11 2019 $
.Dt CONFIG 8
.Os
.Sh NAME
@@ -290,9 +290,6 @@ The commands are as follows:
Add a device through copying another.
.It Ic base Cm 8 | 10 | 16
Change the base of numbers displayed and entered.
-.It Ic bufcachepercent Op Ar number
-Change the BUFCACHEPERCENT value.
-Without arguments, displays its current value.
.It Ic change Ar devno | dev
Modify one or more devices.
.It Ic disable Ar attr val | devno | dev
diff --git a/usr.sbin/config/ukc.c b/usr.sbin/config/ukc.c
index 205a26c01f4..7fcc46a484c 100644
--- a/usr.sbin/config/ukc.c
+++ b/usr.sbin/config/ukc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ukc.c,v 1.23 2017/09/27 15:14:52 deraadt Exp $ */
+/* $OpenBSD: ukc.c,v 1.24 2019/08/11 17:08:33 deraadt Exp $ */
/*
* Copyright (c) 1999-2001 Mats O Jansson. All rights reserved.
@@ -132,7 +132,6 @@ WARNING this kernel doesn't support pseudo devices.\n");
nopdev = 1;
}
- check_int(I_BUFCACHEPCT, "BUFCACHEPERCENT");
check_int(I_NKMEMPG, "NKMEMPAGES");
init();
diff --git a/usr.sbin/config/ukc.h b/usr.sbin/config/ukc.h
index df78a5834af..b8ef2463caf 100644
--- a/usr.sbin/config/ukc.h
+++ b/usr.sbin/config/ukc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ukc.h,v 1.14 2017/09/27 15:14:52 deraadt Exp $ */
+/* $OpenBSD: ukc.h,v 1.15 2019/08/11 17:08:33 deraadt Exp $ */
/*
* Copyright (c) 1999-2001 Mats O Jansson. All rights reserved.
@@ -45,10 +45,8 @@
#define P_PDEVNAMES 15
#define I_PDEVSIZE 16
#define S_PDEVINIT 17
-#define I_NMBCLUSTERS 18
-#define I_BUFCACHEPCT 19
-#define I_NKMEMPG 20
-#define NLENTRIES 21
+#define I_NKMEMPG 18
+#define NLENTRIES 19
#ifdef UKC_MAIN
struct nlist nl[] = {
@@ -70,8 +68,6 @@ struct nlist nl[] = {
{ "_pdevnames" },
{ "_pdevnames_size" },
{ "_pdevinit" },
- { "_nmbclust" },
- { "_bufcachepercent" },
{ "_nkmempages" },
{ NULL },
};
@@ -94,8 +90,6 @@ struct nlist knl[] = {
{ "_pdevnames" },
{ "_pdevnames_size" },
{ "_pdevinit" },
- { "_nmbclust" },
- { "_bufcachepercent" },
{ "_nkmempages" },
{ NULL },
};