1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-16 10:20:30 +00:00

Save /etc/sysconfig data at the very very end, so that it can be

used post-install time as a configuration tool as well.

Update comments about a kernel recompile being necessary for PS/2 mice.
This commit is contained in:
Jordan K. Hubbard 1997-02-10 19:44:08 +00:00
parent 1e49bd9cd3
commit 152ae47983
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=22549
9 changed files with 21 additions and 30 deletions

View File

@ -48,6 +48,7 @@
#undef MSDOSFS
#include <sys/stat.h>
#include <unistd.h>
#include <ufs/ufs/ufsmount.h>
static void create_termcap(void);
static void fixit_common(void);
@ -446,8 +447,6 @@ installExpress(dialogMenuItem *self)
/* Give user the option of one last configuration spree */
installConfigure();
}
/* Now write out any changes .. */
configSysconfig("/etc/sysconfig");
return i | DITEM_RESTORE;
}
@ -601,9 +600,6 @@ installNovice(dialogMenuItem *self)
/* Give user the option of one last configuration spree */
installConfigure();
/* Now write out any changes .. */
configSysconfig("/etc/sysconfig");
return DITEM_LEAVE_MENU | DITEM_RESTORE;
}
@ -617,9 +613,6 @@ installCustomCommit(dialogMenuItem *self)
if (DITEM_STATUS(i) == DITEM_SUCCESS) {
/* Give user the option of one last configuration spree */
installConfigure();
/* Now write out any changes .. */
configSysconfig("/etc/sysconfig");
return i;
}
else

View File

@ -359,8 +359,8 @@ DMenu MenuMouse = {
"somewhat. Once you've selected one of the below, you can specify\n"
"/dev/mouse as your mouse device when running the XFree86 configuration\n"
"utility (see Configuration menu). Please note that for PS/2 mice,\n"
"a kernel recompile is also required! See the handbook for more details\n"
"on building a kernel.",
"you need to enable the psm driver in the kernel configuration menu\n"
"when installing for the first time.",
"For more information, visit the Documentation menu",
NULL,
{ { "COM1", "Serial mouse on COM1", whichMouse, dmenuSystemCommand, NULL,

View File

@ -118,6 +118,10 @@ systemShutdown(int status)
if (status >=0 && mediaDevice)
mediaDevice->shutdown(mediaDevice);
/* write out any changes to sysconfig .. */
if (!status)
configSysconfig("/etc/sysconfig");
/* Shut down the dialog library */
if (DialogActive) {
end_dialog();

View File

@ -48,6 +48,7 @@
#undef MSDOSFS
#include <sys/stat.h>
#include <unistd.h>
#include <ufs/ufs/ufsmount.h>
static void create_termcap(void);
static void fixit_common(void);
@ -446,8 +447,6 @@ installExpress(dialogMenuItem *self)
/* Give user the option of one last configuration spree */
installConfigure();
}
/* Now write out any changes .. */
configSysconfig("/etc/sysconfig");
return i | DITEM_RESTORE;
}
@ -601,9 +600,6 @@ installNovice(dialogMenuItem *self)
/* Give user the option of one last configuration spree */
installConfigure();
/* Now write out any changes .. */
configSysconfig("/etc/sysconfig");
return DITEM_LEAVE_MENU | DITEM_RESTORE;
}
@ -617,9 +613,6 @@ installCustomCommit(dialogMenuItem *self)
if (DITEM_STATUS(i) == DITEM_SUCCESS) {
/* Give user the option of one last configuration spree */
installConfigure();
/* Now write out any changes .. */
configSysconfig("/etc/sysconfig");
return i;
}
else

View File

@ -359,8 +359,8 @@ DMenu MenuMouse = {
"somewhat. Once you've selected one of the below, you can specify\n"
"/dev/mouse as your mouse device when running the XFree86 configuration\n"
"utility (see Configuration menu). Please note that for PS/2 mice,\n"
"a kernel recompile is also required! See the handbook for more details\n"
"on building a kernel.",
"you need to enable the psm driver in the kernel configuration menu\n"
"when installing for the first time.",
"For more information, visit the Documentation menu",
NULL,
{ { "COM1", "Serial mouse on COM1", whichMouse, dmenuSystemCommand, NULL,

View File

@ -118,6 +118,10 @@ systemShutdown(int status)
if (status >=0 && mediaDevice)
mediaDevice->shutdown(mediaDevice);
/* write out any changes to sysconfig .. */
if (!status)
configSysconfig("/etc/sysconfig");
/* Shut down the dialog library */
if (DialogActive) {
end_dialog();

View File

@ -48,6 +48,7 @@
#undef MSDOSFS
#include <sys/stat.h>
#include <unistd.h>
#include <ufs/ufs/ufsmount.h>
static void create_termcap(void);
static void fixit_common(void);
@ -446,8 +447,6 @@ installExpress(dialogMenuItem *self)
/* Give user the option of one last configuration spree */
installConfigure();
}
/* Now write out any changes .. */
configSysconfig("/etc/sysconfig");
return i | DITEM_RESTORE;
}
@ -601,9 +600,6 @@ installNovice(dialogMenuItem *self)
/* Give user the option of one last configuration spree */
installConfigure();
/* Now write out any changes .. */
configSysconfig("/etc/sysconfig");
return DITEM_LEAVE_MENU | DITEM_RESTORE;
}
@ -617,9 +613,6 @@ installCustomCommit(dialogMenuItem *self)
if (DITEM_STATUS(i) == DITEM_SUCCESS) {
/* Give user the option of one last configuration spree */
installConfigure();
/* Now write out any changes .. */
configSysconfig("/etc/sysconfig");
return i;
}
else

View File

@ -359,8 +359,8 @@ DMenu MenuMouse = {
"somewhat. Once you've selected one of the below, you can specify\n"
"/dev/mouse as your mouse device when running the XFree86 configuration\n"
"utility (see Configuration menu). Please note that for PS/2 mice,\n"
"a kernel recompile is also required! See the handbook for more details\n"
"on building a kernel.",
"you need to enable the psm driver in the kernel configuration menu\n"
"when installing for the first time.",
"For more information, visit the Documentation menu",
NULL,
{ { "COM1", "Serial mouse on COM1", whichMouse, dmenuSystemCommand, NULL,

View File

@ -118,6 +118,10 @@ systemShutdown(int status)
if (status >=0 && mediaDevice)
mediaDevice->shutdown(mediaDevice);
/* write out any changes to sysconfig .. */
if (!status)
configSysconfig("/etc/sysconfig");
/* Shut down the dialog library */
if (DialogActive) {
end_dialog();