From owner-cvs-all@FreeBSD.ORG Tue Mar 25 12:13:14 2008 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D1314106566B; Tue, 25 Mar 2008 12:13:14 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 74D7E8FC33; Tue, 25 Mar 2008 12:13:14 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2PCDENT066377; Tue, 25 Mar 2008 12:13:14 GMT (envelope-from cperciva@repoman.freebsd.org) Received: (from cperciva@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2PCDE8L066376; Tue, 25 Mar 2008 12:13:14 GMT (envelope-from cperciva) Message-Id: <200803251213.m2PCDE8L066376@repoman.freebsd.org> From: Colin Percival Date: Tue, 25 Mar 2008 12:13:12 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/etc freebsd-update.conf X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Mar 2008 12:13:15 -0000 cperciva 2008-03-25 12:13:12 UTC FreeBSD src repository Modified files: etc freebsd-update.conf Log: Add /boot/device.hints to the list of files which will have local modifications merged. I had initially expected that people would put any local changes into /boot/loader.conf, but it turns out that editing /boot/device.hints is something many people do. Suggested by: Jaakko Heinonen MFC after: 1 week Revision Changes Path 1.4 +1 -1 src/etc/freebsd-update.conf