d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Makoto Matsushita 2001-12-01 13:13:27 +00:00
parent 44eff22f2a
commit aab37bd55c
7 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/sade/Makefile
View File

@ -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 \

9
usr.sbin/sade/install.c
View File

@ -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);

1
usr.sbin/sade/sade.h
View File

@ -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"

2
usr.sbin/sysinstall/Makefile
View File

@ -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 \

9
usr.sbin/sysinstall/install.c
View File

@ -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);

2
usr.sbin/sysinstall/options.c
View File

@ -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",

1
usr.sbin/sysinstall/sysinstall.h
View File

@ -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"