[src/netbsd-1-5]: src/distrib/utils/sysinst Pull up rev. 1.22 to netbsd-1-5 b...

[hubertf <hubertf%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/499e0ae59fe4
branches:  netbsd-1-5
changeset: 489434:499e0ae59fe4
user:      hubertf <hubertf%NetBSD.org@localhost>
date:      Mon Sep 11 22:13:12 2000 +0000

description:
Pull up rev. 1.22 to netbsd-1-5 branch, OK'd by thorpej:
 > Move aside X link before /etc, and move the X link back if moving /etc fails.
 > Else if moving X fails, the system will end with no /etc.

diffstat:

 distrib/utils/sysinst/upgrade.c |  18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diffs (37 lines):

diff -r 20f55f143416 -r 499e0ae59fe4 distrib/utils/sysinst/upgrade.c
--- a/distrib/utils/sysinst/upgrade.c   Mon Sep 11 20:16:40 2000 +0000
+++ b/distrib/utils/sysinst/upgrade.c   Mon Sep 11 22:13:12 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: upgrade.c,v 1.20.10.1 2000/09/08 23:57:20 hubertf Exp $        */
+/*     $NetBSD: upgrade.c,v 1.20.10.2 2000/09/11 22:13:12 hubertf Exp $        */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -84,18 +84,20 @@
                return;
 
        /*
-        * Move target /etc -> target /etc.old so existing configuration
-        * isn't overwritten by upgrade.
-        */
-       if (save_etc())
-               return;
-
-       /*
         * Save X symlink, ...
         */
        if (save_X())
                return;
 
+       /*
+        * Move target /etc -> target /etc.old so existing configuration
+        * isn't overwritten by upgrade.
+        */
+       if (save_etc()) {
+               merge_X();
+               return;
+       }
+
        /* Do any md updating of the file systems ... e.g. bootblocks,
           copy file systems ... */
        if (!md_update())