From owner-freebsd-current Tue Aug 13 9:33:41 2002 Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 87A9C37B400 for ; Tue, 13 Aug 2002 09:33:38 -0700 (PDT) Received: from mx1.datanet.hu (mx1.datanet.hu [194.149.13.165]) by mx1.FreeBSD.org (Postfix) with ESMTP id 011A443E70 for ; Tue, 13 Aug 2002 09:33:38 -0700 (PDT) (envelope-from sziszi@bsd.hu) Received: from fonix.adamsfamily.xx (nilus-1647.adsl.datanet.hu [195.56.94.123]) by mx1.datanet.hu (DataNet) with ESMTP id 12A6526B092 for ; Tue, 13 Aug 2002 18:33:36 +0200 (CEST) Received: from fonix.adamsfamily.xx (localhost [127.0.0.1]) by fonix.adamsfamily.xx (8.12.5/8.12.5) with ESMTP id g7DGXZ8g001652 for ; Tue, 13 Aug 2002 18:33:35 +0200 (CEST) (envelope-from sziszi@bsd.hu) Received: (from cc@localhost) by fonix.adamsfamily.xx (8.12.5/8.12.5/Submit) id g7DGXYpG001651 for current@FreeBSD.ORG; Tue, 13 Aug 2002 18:33:34 +0200 (CEST) X-Authentication-Warning: fonix.adamsfamily.xx: cc set sender to sziszi@bsd.hu using -f Date: Tue, 13 Aug 2002 18:33:33 +0200 From: Szilveszter Adam To: current@FreeBSD.ORG Subject: Re: Weirdness trying -STABLE -> -CURRENT Message-ID: <20020813163333.GD1105@fonix.adamsfamily.xx> Mail-Followup-To: Szilveszter Adam , current@FreeBSD.ORG References: <20020811194119.GA897@fonix.adamsfamily.xx> <200208130004.g7D04e2T003783@bunrab.catwhisker.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200208130004.g7D04e2T003783@bunrab.catwhisker.org> User-Agent: Mutt/1.5.1i Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Hello David, Thanks for getting back with the results. This points to the fatc that the instructions in UPDATING should updated. The method is almost what you did, only a tad more efficient: - make buildworld - make buildkernel KERNCONF=you_know_what - cp GENERIC.hints to device.hints or create your own if you need (because you have ISA devices eg) - make installkernel KERNCONF=you_know_what - reboot in single user (do the bootblocks if needed) (At this point you are running on the -CURRENT kernel but with the old userland: be aware of this because things like ipfw will now stop working until you are back in sync!) - mergemaster -p - make -k installworld (this will install as much of the new userland as possible, but will proceed in spite of errors.) - rm -rf /usr/include/* - make installworld (this now should go through without problems, you are now back in sync, your /usr/include is also repopulated with the new headers) - mergemaster (with the new mergemaster script) - reboot for the changes to take effect. Done. Hope this helps. -- Regards: Szilveszter ADAM Szombathely Hungary To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message