From owner-svn-src-all@FreeBSD.ORG  Fri Jan 22 20:06:58 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 243FB106566B;
	Fri, 22 Jan 2010 20:06:58 +0000 (UTC)
	(envelope-from gavin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 11A328FC0C;
	Fri, 22 Jan 2010 20:06:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0MK6v8w072015;
	Fri, 22 Jan 2010 20:06:57 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0MK6vFR072013;
	Fri, 22 Jan 2010 20:06:57 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201001222006.o0MK6vFR072013@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Fri, 22 Jan 2010 20:06:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202825 - stable/7/sbin/dumpfs
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Jan 2010 20:06:58 -0000

Author: gavin
Date: Fri Jan 22 20:06:57 2010
New Revision: 202825
URL: http://svn.freebsd.org/changeset/base/202825

Log:
  Merge r201647 from head:
    Print leading zeros in the UFS2 FSID.
  
  PR:		bin/142155
  Submitted by:	Efstratios Karatzas  gpf.kira gmail.com
  Approved by:	ed (mentor, implicit)

Modified:
  stable/7/sbin/dumpfs/dumpfs.c
Directory Properties:
  stable/7/sbin/dumpfs/   (props changed)

Modified: stable/7/sbin/dumpfs/dumpfs.c
==============================================================================
--- stable/7/sbin/dumpfs/dumpfs.c	Fri Jan 22 20:02:22 2010	(r202824)
+++ stable/7/sbin/dumpfs/dumpfs.c	Fri Jan 22 20:06:57 2010	(r202825)
@@ -160,7 +160,7 @@ dumpfs(const char *name)
 		fstime = afs.fs_old_time;
 		printf("magic\t%x (UFS1)\ttime\t%s",
 		    afs.fs_magic, ctime(&fstime));
-		printf("id\t[ %x %x ]\n", afs.fs_id[0], afs.fs_id[1]);
+		printf("id\t[ %08x %08x ]\n", afs.fs_id[0], afs.fs_id[1]);
 		printf("ncg\t%d\tsize\t%jd\tblocks\t%jd\n",
 		    afs.fs_ncg, (intmax_t)fssize, (intmax_t)afs.fs_dsize);
 		break;