Module Name: src
Committed By: jdf
Date: Mon Apr 9 23:18:31 UTC 2012
Modified Files:
src/distrib/utils/sysinst: util.c
Log Message:
Make sysinst not store the keyboard or network configuration used while
upgrading, as issued by PR install/35538.
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/distrib/utils/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/util.c
diff -u src/distrib/utils/sysinst/util.c:1.176 src/distrib/utils/sysinst/util.c:1.177
--- src/distrib/utils/sysinst/util.c:1.176 Sat Apr 7 19:02:57 2012
+++ src/distrib/utils/sysinst/util.c Mon Apr 9 23:18:31 2012
@@ -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 @@ get_and_unpack_sets(int update, msg setu
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();
