From edwin@mavetju.org  Thu Dec  1 21:04:52 2005
Return-Path: <edwin@mavetju.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 11D3B16A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  1 Dec 2005 21:04:52 +0000 (GMT)
	(envelope-from edwin@mavetju.org)
Received: from mail3out.barnet.com.au (mail3out.barnet.com.au [202.83.176.17])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4B05043D6A
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  1 Dec 2005 21:04:50 +0000 (GMT)
	(envelope-from edwin@mavetju.org)
Received: by mail3out.barnet.com.au (Postfix, from userid 27)
	id 3E1F4877C95; Fri,  2 Dec 2005 08:04:48 +1100 (EST)
Received: from mail3-auth.barnet.com.au (mail3.barnet.com.au [202.83.176.16])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client CN "*.barnet.com.au", Issuer "BarNet Root Certificate Authority" (verified OK))
	by mail3.barnet.com.au (Postfix) with ESMTP id 1AE0A877C8A
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  2 Dec 2005 08:04:48 +1100 (EST)
Received: from k7.mavetju (edwin-3.int.barnet.com.au [10.10.12.2])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client CN "edwin.adsl.barnet.com.au", Issuer "BarNet Root Certificate Authority" (not verified))
	by mail3-auth.barnet.com.au (Postfix) with ESMTP id B19B9877C5E
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  2 Dec 2005 08:04:47 +1100 (EST)
Received: by k7.mavetju (Postfix, from userid 1001)
	id 8972462B0; Fri,  2 Dec 2005 08:04:46 +1100 (EST)
Message-Id: <20051201210446.8972462B0@k7.mavetju>
Date: Fri,  2 Dec 2005 08:04:46 +1100 (EST)
From: Edwin Groothuis <edwin@mavetju.org>
Reply-To: Edwin Groothuis <edwin@mavetju.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] let sysinstall preserve sysctl.conf too!
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         89817
>Category:       bin
>Synopsis:       [patch] let sysinstall preserve sysctl.conf too!
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    philip
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 01 21:10:01 GMT 2005
>Closed-Date:    Thu Dec 01 21:44:56 GMT 2005
>Last-Modified:  Thu Dec 01 21:44:56 GMT 2005
>Originator:     Edwin Groothuis
>Release:        FreeBSD 6.0-RELEASE i386
>Organization:
-
>Environment:
System: FreeBSD janus.barnet.com.au 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Thu Nov  3 09:36:13 UTC 2005     root@x64.samsco.home:/usr/obj/usr/src/sys/GENERIC  i386

>Description:

After upgrading our test postgresql server, the databases didn't
come back online because of the dreaded shared memory problem.

Checking /etc/sysctl.conf, we saw it was reverted during the upgrade
of the system.

>How-To-Repeat:

- make modifications to /etc/sysctl.conf
- upgrade to 6.0 via the binary upgrade
- check /etc/sysctl.conf

>Fix:

--- src/usr.sbin/sysinstall/installUpgrade.c.orig       Fri Dec  2 08:01:00 2005
+++ src/usr.sbin/sysinstall/installUpgrade.c    Fri Dec  2 08:01:01 2005
@@ -118,6 +118,7 @@
    { JUST_COPY,                "skeykeys",             TRUE, NULL },
    { JUST_COPY,                "spwd.db",              TRUE, NULL },
    { JUST_COPY,                "ssh",                  TRUE, NULL },
+   { JUST_COPY,                "sysctl.conf",          TRUE, NULL },
    { JUST_COPY,                "syslog.conf",          TRUE, NULL },
    { JUST_COPY,                "ttys",                 TRUE, NULL },
    { JUST_COPY,                "uucp",                 TRUE, NULL },

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->philip 
Responsible-Changed-By: philip 
Responsible-Changed-When: Thu Dec 1 21:11:43 GMT 2005 
Responsible-Changed-Why:  
Grab this for testing and committing. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=89817 
State-Changed-From-To: open->closed 
State-Changed-By: philip 
State-Changed-When: Thu Dec 1 21:44:13 GMT 2005 
State-Changed-Why:  
Committed.  Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=89817 
>Unformatted:
