From owner-freebsd-stable@FreeBSD.ORG Sat Nov 17 15:31:42 2007 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 330F616A41B for ; Sat, 17 Nov 2007 15:31:42 +0000 (UTC) (envelope-from cperciva@freebsd.org) Received: from pd2mo2so.prod.shaw.ca (idcmail-mo1so.shaw.ca [24.71.223.10]) by mx1.freebsd.org (Postfix) with ESMTP id 0CF3B13C478 for ; Sat, 17 Nov 2007 15:31:41 +0000 (UTC) (envelope-from cperciva@freebsd.org) Received: from pd2mr5so.prod.shaw.ca (pd2mr5so-qfe3.prod.shaw.ca [10.0.141.8]) by l-daemon (Sun ONE Messaging Server 6.0 HotFix 1.01 (built Mar 15 2004)) with ESMTP id <0JRN00H0HPS34P80@l-daemon> for freebsd-stable@freebsd.org; Sat, 17 Nov 2007 08:31:15 -0700 (MST) Received: from pn2ml7so.prod.shaw.ca ([10.0.121.151]) by pd2mr5so.prod.shaw.ca (Sun Java System Messaging Server 6.2-7.05 (built Sep 5 2006)) with ESMTP id <0JRN00DTVPS27J10@pd2mr5so.prod.shaw.ca> for freebsd-stable@freebsd.org; Sat, 17 Nov 2007 08:31:15 -0700 (MST) Received: from hexahedron.daemonology.net ([24.82.201.197]) by l-daemon (Sun ONE Messaging Server 6.0 HotFix 1.01 (built Mar 15 2004)) with SMTP id <0JRN00A7EPS2QX70@l-daemon> for freebsd-stable@freebsd.org; Sat, 17 Nov 2007 08:31:14 -0700 (MST) Received: (qmail 34849 invoked from network); Sat, 17 Nov 2007 15:31:05 +0000 Received: from unknown (HELO hexahedron.daemonology.net) (127.0.0.1) by localhost with SMTP; Sat, 17 Nov 2007 15:31:05 +0000 Date: Sat, 17 Nov 2007 07:31:05 -0800 From: Colin Percival In-reply-to: <473EF438.5090004@janh.de> To: Jan Henrik Sylvester Message-id: <473F0939.9050800@freebsd.org> MIME-version: 1.0 Content-type: text/plain; charset=ISO-8859-1 Content-transfer-encoding: 7bit X-Enigmail-Version: 0.95.5 References: <473B5D10.1070109@janh.de> <473BD54F.9050808@freebsd.org> <473C1FD1.70001@janh.de> <473DA6B5.10107@freebsd.org> <473EF438.5090004@janh.de> User-Agent: Thunderbird 2.0.0.9 (X11/20071117) Cc: stable-list freebsd Subject: Re: freebsd-update 6.2-R -> 6.3-B1 rollback failed X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 15:31:42 -0000 Jan Henrik Sylvester wrote: >> In short, as long as you don't build a custom kernel but call it >> "GENERIC" or >> "SMP", FreeBSD Update should automatically DTRT. > > That is exactly my question. On 6.2-RELEASE, I sometimes used a modified > ld-elf.so.1 or a single patched module without recompiling the kernel. > What does using freebsd-update (accidentally or deliberately) do in that > case? By accident, I discovered that it does not always fail. Does it > skip the modified files, overwrite them with new versions, or overwrite > them with an unpredictable bdiff merge that is likely garbage? Depending on the UpdateIfUnmodified option in freebsd-update.conf, it will either update files to "clean" new versions or print a warning message and not touch them. There's also an IgnorePaths directive which you can use to tell FreeBSD Update not to touch some files (even if they haven't been modified locally). FreeBSD Update will never produce mangled files as a result of applying a bsdiff patch to the wrong file -- it checks file hashes before and after applying patches and gracefully falls back to downloading complete files if it can't generate a file via patching. Colin Percival