mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-15 10:17:20 +00:00
Code Issues Releases Activity

More save_userconfig to a more appropriate spot.

Browse Source
This commit is contained in:
Jordan K. Hubbard 1998-09-30 20:33:56 +00:00
parent 4d075b334c
commit ec8c21cf11
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=39837
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
release/sysinstall/install.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: install.c,v 1.211 1998/09/29 05:12:39 jkh Exp $
* $Id: install.c,v 1.212 1998/09/29 14:23:13 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -744,15 +744,15 @@ installFixup(dialogMenuItem *self)
if (!file_readable("/kernel")) {
if (file_readable("/kernel.GENERIC")) {
#ifdef SAVE_USERCONFIG
/* Snapshot any boot -c changes back to the GENERIC kernel */
if (!variable_cmp(VAR_RELNAME, RELEASE_NAME))
save_userconfig_to_kernel("/kernel.GENERIC");
#endif
if (vsystem("cp -p /kernel.GENERIC /kernel")) {
msgConfirm("Unable to link /kernel into place!");
return DITEM_FAILURE;
}
#ifdef SAVE_USERCONFIG
/* Snapshot any boot -c changes back to the new kernel */
if (!variable_cmp(VAR_RELNAME, RELEASE_NAME))
save_userconfig_to_kernel("/kernel");
#endif
}
else {
msgConfirm("Can't find a kernel image to link to on the root file system!\n"

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

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: install.c,v 1.211 1998/09/29 05:12:39 jkh Exp $
* $Id: install.c,v 1.212 1998/09/29 14:23:13 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -744,15 +744,15 @@ installFixup(dialogMenuItem *self)
if (!file_readable("/kernel")) {
if (file_readable("/kernel.GENERIC")) {
#ifdef SAVE_USERCONFIG
/* Snapshot any boot -c changes back to the GENERIC kernel */
if (!variable_cmp(VAR_RELNAME, RELEASE_NAME))
save_userconfig_to_kernel("/kernel.GENERIC");
#endif
if (vsystem("cp -p /kernel.GENERIC /kernel")) {
msgConfirm("Unable to link /kernel into place!");
return DITEM_FAILURE;
}
#ifdef SAVE_USERCONFIG
/* Snapshot any boot -c changes back to the new kernel */
if (!variable_cmp(VAR_RELNAME, RELEASE_NAME))
save_userconfig_to_kernel("/kernel");
#endif
}
else {
msgConfirm("Can't find a kernel image to link to on the root file system!\n"

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

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: install.c,v 1.211 1998/09/29 05:12:39 jkh Exp $
* $Id: install.c,v 1.212 1998/09/29 14:23:13 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -744,15 +744,15 @@ installFixup(dialogMenuItem *self)
if (!file_readable("/kernel")) {
if (file_readable("/kernel.GENERIC")) {
#ifdef SAVE_USERCONFIG
/* Snapshot any boot -c changes back to the GENERIC kernel */
if (!variable_cmp(VAR_RELNAME, RELEASE_NAME))
save_userconfig_to_kernel("/kernel.GENERIC");
#endif
if (vsystem("cp -p /kernel.GENERIC /kernel")) {
msgConfirm("Unable to link /kernel into place!");
return DITEM_FAILURE;
}
#ifdef SAVE_USERCONFIG
/* Snapshot any boot -c changes back to the new kernel */
if (!variable_cmp(VAR_RELNAME, RELEASE_NAME))
save_userconfig_to_kernel("/kernel");
#endif
}
else {
msgConfirm("Can't find a kernel image to link to on the root file system!\n"