Remove kget() feature, which is removed from 5-current kernel.

Since userconfig feature is implemented by tweaking variables (hint.*)
with loader(8), we can put back an equivalent feature.  Maybe the first
step for this is to commit yokota-san's patch (add userconfig command
for loader).

Approved by:	jkh

7 files changed, 2 insertions, 24 deletions

diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile
index bbfff38..660bd9e 100644
--- a/usr.sbin/sade/Makefile
+++ b/usr.sbin/sade/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	sysinstall
 MAN=	sysinstall.8
-SRCS=	anonFTP.c cdrom.c command.c config.c devices.c dhcp.c kget.c \
+SRCS=	anonFTP.c cdrom.c command.c config.c devices.c dhcp.c \
 	disks.c dispatch.c dist.c dmenu.c doc.c dos.c floppy.c \
 	ftp.c globals.c http.c index.c install.c installUpgrade.c keymap.c \
 	label.c main.c makedevs.c media.c menus.c misc.c modules.c \
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 83357b2..b2399f8 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -755,14 +755,6 @@ installFixupBin(dialogMenuItem *self)
     /* All of this is done only as init, just to be safe */
     if (RunningAsInit) {
 #ifdef __i386__
-        /* Snapshot any boot -c changes back to the new kernel */
-	cp = variable_get(VAR_KGET);
-	if (cp && (*cp == 'Y' || *cp == 'y')) {
-	    if ((kstat = kget("/boot/kernel.conf")) != NULL) {
-		msgConfirm("Unable to save boot -c changes to new kernel,\n"
-			   "please see the debug screen (ALT-F2) for details.");
-	    }
-	}
 	if ((fp = fopen("/boot/loader.conf", "a")) != NULL) {
 	    if (!kstat || !OnVTY)
 		fprintf(fp, "# -- sysinstall generated deltas -- #\n");
@@ -1054,7 +1046,6 @@ installVarDefaults(dialogMenuItem *self)
     /* Set default startup options */
     variable_set2(VAR_RELNAME,			getRelname(), 0);
     variable_set2(VAR_CPIO_VERBOSITY,		"high", 0);
-    variable_set2(VAR_KGET,			"YES", 0);
     variable_set2(VAR_TAPE_BLOCKSIZE,		DEFAULT_TAPE_BLOCKSIZE, 0);
     variable_set2(VAR_INSTALL_ROOT,		"/", 0);
     variable_set2(VAR_INSTALL_CFG,		"install.cfg", 0);
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 3653c32..cc40882 100644
--- a/usr.sbin/sade/sade.h
+++ b/usr.sbin/sade/sade.h
@@ -126,7 +126,6 @@
 #define VAR_IPV6_ENABLE			"ipv6_enable"
 #define VAR_IPV6ADDR			"ipv6addr"
 #define VAR_KEYMAP			"keymap"
-#define VAR_KGET			"kget"
 #define VAR_LABEL			"label"
 #define VAR_LABEL_COUNT			"labelCount"
 #define VAR_LINUX_ENABLE		"linux_enable"
diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile
index bbfff38..660bd9e 100644
--- a/usr.sbin/sysinstall/Makefile
+++ b/usr.sbin/sysinstall/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	sysinstall
 MAN=	sysinstall.8
-SRCS=	anonFTP.c cdrom.c command.c config.c devices.c dhcp.c kget.c \
+SRCS=	anonFTP.c cdrom.c command.c config.c devices.c dhcp.c \
 	disks.c dispatch.c dist.c dmenu.c doc.c dos.c floppy.c \
 	ftp.c globals.c http.c index.c install.c installUpgrade.c keymap.c \
 	label.c main.c makedevs.c media.c menus.c misc.c modules.c \
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 83357b2..b2399f8 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -755,14 +755,6 @@ installFixupBin(dialogMenuItem *self)
     /* All of this is done only as init, just to be safe */
     if (RunningAsInit) {
 #ifdef __i386__
-        /* Snapshot any boot -c changes back to the new kernel */
-	cp = variable_get(VAR_KGET);
-	if (cp && (*cp == 'Y' || *cp == 'y')) {
-	    if ((kstat = kget("/boot/kernel.conf")) != NULL) {
-		msgConfirm("Unable to save boot -c changes to new kernel,\n"
-			   "please see the debug screen (ALT-F2) for details.");
-	    }
-	}
 	if ((fp = fopen("/boot/loader.conf", "a")) != NULL) {
 	    if (!kstat || !OnVTY)
 		fprintf(fp, "# -- sysinstall generated deltas -- #\n");
@@ -1054,7 +1046,6 @@ installVarDefaults(dialogMenuItem *self)
     /* Set default startup options */
     variable_set2(VAR_RELNAME,			getRelname(), 0);
     variable_set2(VAR_CPIO_VERBOSITY,		"high", 0);
-    variable_set2(VAR_KGET,			"YES", 0);
     variable_set2(VAR_TAPE_BLOCKSIZE,		DEFAULT_TAPE_BLOCKSIZE, 0);
     variable_set2(VAR_INSTALL_ROOT,		"/", 0);
     variable_set2(VAR_INSTALL_CFG,		"install.cfg", 0);
diff --git a/usr.sbin/sysinstall/options.c b/usr.sbin/sysinstall/options.c
index bf82239..9bd0360 100644
--- a/usr.sbin/sysinstall/options.c
+++ b/usr.sbin/sysinstall/options.c
@@ -148,8 +148,6 @@ static Option Options[] = {
       OPT_IS_VAR,	NEWFS_PROMPT,		VAR_NEWFS_ARGS,		varCheck	},
 { "Fixit Console",	"Which tty to use for the Fixit action.",
       OPT_IS_FUNC,	fixitTtyWhich,		VAR_FIXIT_TTY,		varCheck	},
-{ "Config save",	"Whether or not to save installation kernel config changes",
-      OPT_IS_VAR,	NULL,			VAR_KGET,		varCheck	},
 { "Re-scan Devices",	"Re-run sysinstall's initial device probe",
       OPT_IS_FUNC,	deviceRescan },
 { "Use Defaults",	"Reset all values to startup defaults",
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 3653c32..cc40882 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -126,7 +126,6 @@
 #define VAR_IPV6_ENABLE			"ipv6_enable"
 #define VAR_IPV6ADDR			"ipv6addr"
 #define VAR_KEYMAP			"keymap"
-#define VAR_KGET			"kget"
 #define VAR_LABEL			"label"
 #define VAR_LABEL_COUNT			"labelCount"
 #define VAR_LINUX_ENABLE		"linux_enable"