From owner-freebsd-current Tue Nov 13 10:22:33 2001 Delivered-To: freebsd-current@freebsd.org Received: from castle.jp.freebsd.org (castle.jp.FreeBSD.org [210.226.20.15]) by hub.freebsd.org (Postfix) with ESMTP id 9745337B417; Tue, 13 Nov 2001 10:22:28 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id DAA67583; Wed, 14 Nov 2001 03:22:27 +0900 (JST) (envelope-from matusita@jp.FreeBSD.org) Cc: jkh@FreeBSD.org In-Reply-To: <20011114025357G.matusita@jp.FreeBSD.org> References: <20011114025357G.matusita@jp.FreeBSD.org> X-User-Agent: Mew/1.94.2 XEmacs/21.5 (alfalfa) X-FaceAnim: (-O_O-)(O_O- )(_O- )(O- )(- -)( -O)( -O_)( -O_O)(-O_O-) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Dispatcher: imput version 20000228(IM140) Lines: 91 From: Makoto Matsushita To: current@FreeBSD.ORG Subject: PATCH: sysinstall to remove userconfig code Date: Wed, 14 Nov 2001 03:22:24 +0900 Message-Id: <20011114032224W.matusita@jp.FreeBSD.org> Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG 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