Re: install/35538: sysinst duplicates hostname on upgrade

[Julian Djamil Fagir <gnrp%komkon2.de@localhost>]

The following reply was made to PR install/35538; it has been noted by GNATS.

From: Julian Djamil Fagir <gnrp%komkon2.de@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: install/35538: sysinst duplicates hostname on upgrade
Date: Sat, 3 Mar 2012 19:50:01 +0100

 --MP_/2muj.kxQrz.99u2RUvPZ+Em
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 Hi,
 
 >  > The following reply was made to PR install/35538; it has been noted by
 >  > GNATS. imho, network configuration should not be stored when updating
 >  > anyway. You want to only update the system, not change any of the
 >  > configuration.
 >  
 >  The same reasoning applies to the keyboard layout as well?
 you're absolutely right, I didn't look at this.
 The attached patch fixes that.
 
 Regards, Julian
 --MP_/2muj.kxQrz.99u2RUvPZ+Em
 Content-Type: text/x-patch
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=util.c.diff
 
 --- distrib/utils/sysinst/util.c
 +++ distrib/utils/sysinst/util.c
 @@ -1080,15 +1080,17 @@
  
        /* Configure the system */
        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();
  
        /* Install/Upgrade complete ... reboot or exit to script */
 
 
 --MP_/2muj.kxQrz.99u2RUvPZ+Em--