Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only save and merge /etc if the /etc set is being installed.

Browse Source 
Actually this needs changing to use /usr/sbin/etcupdate (or similar),
but the script needs fixing first.
Might be better for sysinst to have its own copy, gets to be fun to run
because you have to pull the commands from the target FS.
This commit is contained in:
dsl 2003-07-08 16:12:18 +00:00
parent 61634e9a74
commit a72609cec0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
distrib/utils/sysinst/upgrade.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: upgrade.c,v 1.36 2003/07/07 12:30:22 dsl Exp $ */
/* $NetBSD: upgrade.c,v 1.37 2003/07/08 16:12:18 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -97,7 +97,7 @@ do_upgrade(void)
* Move target /etc -> target /etc.old so existing configuration
* isn't overwritten by upgrade.
*/
if (save_etc()) {
if (sets_selected & SET_ETC && save_etc()) {
merge_X();
return;
}
@ -119,7 +119,8 @@ do_upgrade(void)
return;
/* Copy back any files we should restore after the upgrade.*/
merge_etc();
if (sets_selected & SET_ETC)
merge_etc();
merge_X();
sanity_check();