[src/trunk]: src/distrib/utils/sysinst Make sysinst not store the keyboard or...

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

details:   https://anonhg.NetBSD.org/src/rev/6c7f0d611fde
branches:  trunk
changeset: 778714:6c7f0d611fde
user:      jdf <jdf%NetBSD.org@localhost>
date:      Mon Apr 09 23:18:31 2012 +0000

description:
Make sysinst not store the keyboard or network configuration used while
upgrading, as issued by PR install/35538.

diffstat:

 distrib/utils/sysinst/util.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (27 lines):

diff -r 63c2cf65a099 -r 6c7f0d611fde distrib/utils/sysinst/util.c
--- a/distrib/utils/sysinst/util.c      Mon Apr 09 19:55:00 2012 +0000
+++ b/distrib/utils/sysinst/util.c      Mon Apr 09 23:18:31 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.c,v 1.176 2012/04/07 19:02:57 jdf Exp $   */
+/*     $NetBSD: util.c,v 1.177 2012/04/09 23:18:31 jdf Exp $   */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1083,11 +1083,13 @@
        if (set_status[SET_BASE] & SET_INSTALLED)
                run_makedev();
 
-       /* Save keybard type */
-       save_kb_encoding();
+       if (!update) {
+               /* Save keybard type */
+               save_kb_encoding();
 
-       /* Other configuration. */
-       mnt_net_config();
+               /* Other configuration. */
+               mnt_net_config();
+       }
 
        /* Mounted dist dir? */
        umount_mnt2();