From owner-svn-src-user@FreeBSD.ORG Thu Mar 27 23:16:19 2014 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F2EFED4A; Thu, 27 Mar 2014 23:16:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DFAA76D6; Thu, 27 Mar 2014 23:16:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2RNGIhD034142; Thu, 27 Mar 2014 23:16:18 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2RNGI3F034141; Thu, 27 Mar 2014 23:16:18 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201403272316.s2RNGI3F034141@svn.freebsd.org> From: Marcel Moolenaar Date: Thu, 27 Mar 2014 23:16:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r263849 - user/marcel/mkimg X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Mar 2014 23:16:19 -0000 Author: marcel Date: Thu Mar 27 23:16:18 2014 New Revision: 263849 URL: http://svnweb.freebsd.org/changeset/base/263849 Log: Properly fill in d_nsectors, d_ntracks, d_ncylinders & d_secpercyl. Round the image size to a multiple of the cyclinder size. Modified: user/marcel/mkimg/bsd.c Modified: user/marcel/mkimg/bsd.c ============================================================================== --- user/marcel/mkimg/bsd.c Thu Mar 27 23:15:07 2014 (r263848) +++ user/marcel/mkimg/bsd.c Thu Mar 27 23:16:18 2014 (r263849) @@ -75,13 +75,16 @@ bsd_write(int fd, lba_t imgsz, void *boo } else memset(buf, 0, BBSIZE); + imgsz = ncyls * nheads * nsecs; + ftruncate(fd, imgsz * secsz); + d = (void *)(buf + LABELSECTOR * secsz + LABELOFFSET); le32enc(&d->d_magic, DISKMAGIC); le32enc(&d->d_secsize, secsz); - le32enc(&d->d_nsectors, 1); /* XXX */ - le32enc(&d->d_ntracks, 1); /* XXX */ - le32enc(&d->d_ncylinders, 0); /* XXX */ - le32enc(&d->d_secpercyl, 1); /* XXX */ + le32enc(&d->d_nsectors, nsecs); + le32enc(&d->d_ntracks, nheads); + le32enc(&d->d_ncylinders, ncyls); + le32enc(&d->d_secpercyl, nsecs * nheads); le32enc(&d->d_secperunit, imgsz); le16enc(&d->d_rpm, 3600); le32enc(&d->d_magic2, DISKMAGIC);