diff options
| author | jkh <jkh@FreeBSD.org> | 1996-11-12 18:39:35 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1996-11-12 18:39:35 +0000 |
| commit | 37631e6b2384f814d416f6a3dae4e9223b66b7af (patch) | |
| tree | 14fa42b44272c492ca342daff1d66a1e8ad9a2eb /usr.sbin | |
| parent | 5ec5b278418b78568f09c6a94337772583138d97 (diff) | |
| download | FreeBSD-src-37631e6b2384f814d416f6a3dae4e9223b66b7af.zip FreeBSD-src-37631e6b2384f814d416f6a3dae4e9223b66b7af.tar.gz | |
Only save userconfig changes if the boot floppy version and the
installed version match.
Pointed-out-by: hosokawa@mt.cs.keio.ac.jp (HOSOKAWA Tatsumi)
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sade/install.c | 5 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/install.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 74282c8..81965a6 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -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.138 1996/11/09 11:57:40 joerg Exp $ + * $Id: install.c,v 1.139 1996/11/09 16:25:47 joerg Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -595,7 +595,8 @@ installFixup(dialogMenuItem *self) if (file_readable("/kernel.GENERIC")) { #ifdef SAVE_USERCONFIG /* Snapshot any boot -c changes back to the GENERIC kernel */ - save_userconfig_to_kernel("/kernel.GENERIC"); + if (!strcmp(variable_get(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!"); diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 74282c8..81965a6 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -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.138 1996/11/09 11:57:40 joerg Exp $ + * $Id: install.c,v 1.139 1996/11/09 16:25:47 joerg Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -595,7 +595,8 @@ installFixup(dialogMenuItem *self) if (file_readable("/kernel.GENERIC")) { #ifdef SAVE_USERCONFIG /* Snapshot any boot -c changes back to the GENERIC kernel */ - save_userconfig_to_kernel("/kernel.GENERIC"); + if (!strcmp(variable_get(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!"); |
