Date: Wed, 14 Nov 2001 03:22:24 +0900 From: Makoto Matsushita <matusita@jp.freebsd.org> To: current@FreeBSD.ORG Cc: jkh@FreeBSD.org Subject: PATCH: sysinstall to remove userconfig code Message-ID: <20011114032224W.matusita@jp.FreeBSD.org> In-Reply-To: <20011114025357G.matusita@jp.FreeBSD.org> References: <Pine.GSO.4.21.0111111732520.25635-100000@harper.uchicago.edu> <Pine.GSO.4.21.0111111732520.25635-100000@harper.uchicago.edu> <20011114025357G.matusita@jp.FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
dsyphers> DEBUG: kget: error buffer sizing
matusita> This is because sysinstall still want to get userconfig data
matusita> and put the result to /boot/kernel.conf.
Userconfig was gone in 5-current, so we can safely remove kget() from
sysinstall. Attached below is a patch to do (kget.c should be remove
also).
Jordan (and others who may concern), would you please review my patch?
-- -
Makoto `MAR' Matsushita
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/sysinstall/Makefile,v
retrieving revision 1.117
diff -u -r1.117 Makefile
--- Makefile 2001/09/05 07:12:19 1.117
+++ Makefile 2001/11/13 18:12:37
@@ -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 \
Index: install.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/sysinstall/install.c,v
retrieving revision 1.309
diff -u -r1.309 install.c
--- install.c 2001/10/20 09:28:53 1.309
+++ install.c 2001/11/13 18:12:37
@@ -755,14 +755,6 @@
/* 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 @@
/* 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);
Index: options.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/sysinstall/options.c,v
retrieving revision 1.76
diff -u -r1.76 options.c
--- options.c 2001/09/25 00:28:26 1.76
+++ options.c 2001/11/13 18:12:37
@@ -148,8 +148,6 @@
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",
Index: sysinstall.h
===================================================================
RCS file: /home/ncvs/src/usr.sbin/sysinstall/sysinstall.h,v
retrieving revision 1.218
diff -u -r1.218 sysinstall.h
--- sysinstall.h 2001/10/12 22:39:02 1.218
+++ sysinstall.h 2001/11/13 18:12:38
@@ -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"
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20011114032224W.matusita>