From owner-cvs-src@FreeBSD.ORG Thu Nov 15 16:18:05 2007 Return-Path: Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F1E6A16A46C; Thu, 15 Nov 2007 16:18:05 +0000 (UTC) (envelope-from rink@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DFEE913C447; Thu, 15 Nov 2007 16:18:05 +0000 (UTC) (envelope-from rink@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 lAFGI5N1066942; Thu, 15 Nov 2007 16:18:05 GMT (envelope-from rink@repoman.freebsd.org) Received: (from rink@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAFGI5tb066941; Thu, 15 Nov 2007 16:18:05 GMT (envelope-from rink) Message-Id: <200711151618.lAFGI5tb066941@repoman.freebsd.org> From: Rink Springer Date: Thu, 15 Nov 2007 16:18:05 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/lib/libdisk open_disk.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Nov 2007 16:18:06 -0000 rink 2007-11-15 16:18:05 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) lib/libdisk open_disk.c Log: MFC Approved by: imp (mentor) rink 2007-08-05 16:55:40 UTC FreeBSD src repository Modified files: lib/libdisk open_disk.c Log: Improve error handling in libdisk while parsing the kern.geom.conftxt sysctl. Previously, any parse error will result in the calling program exiting with an unpleasant message. This change will cause libdisk to issue a warning and ignore lines it cannot parse instead of bluntly terminating the unfortunate enough program. This change will allow you to use sysinstall if you have a NTFS parition with a space in the name (such as 'Win Xp'). In such a case, a line like the following will appear in the kern.geom.conftxt output: 2 LABEL ntfs/Win Xp 209818635264 512 i 0 o 0 As the fields are space-separated, libdisk would go beserk and exit the program. This would happen if using FreeBSD 7.0 snapshot images (as GEOM_LABEL is in the installation kernel as well), thus making it impossible to install FreeBSD without renaming your NTFS paritions. Reported by: Dwight Berendse Nod from: phk Reviewed by: imp Approved by: re (bmah), imp (mentor) MFC after: 1 month Revision Changes Path 1.11 +38 -19 src/lib/libdisk/open_disk.c Revision Changes Path 1.10.2.1 +38 -19 src/lib/libdisk/open_disk.c