From owner-svn-src-all@FreeBSD.ORG  Sun Jun 21 02:45:32 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 840DD1BF;
 Sun, 21 Jun 2015 02:45:32 +0000 (UTC)
 (envelope-from marcel@FreeBSD.org)
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 724776D5;
 Sun, 21 Jun 2015 02:45:32 +0000 (UTC)
 (envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5L2jWLG036018;
 Sun, 21 Jun 2015 02:45:32 GMT (envelope-from marcel@FreeBSD.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5L2jWmN036016;
 Sun, 21 Jun 2015 02:45:32 GMT (envelope-from marcel@FreeBSD.org)
Message-Id: <201506210245.t5L2jWmN036016@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marcel set sender to
 marcel@FreeBSD.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sun, 21 Jun 2015 02:45:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284658 - head/usr.bin/mkimg
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
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/options/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: Sun, 21 Jun 2015 02:45:32 -0000

Author: marcel
Date: Sun Jun 21 02:45:31 2015
New Revision: 284658
URL: https://svnweb.freebsd.org/changeset/base/284658

Log:
  Microsoft Azure expects the creator OS to be "Wi2k" and not "FBSD".
  The image is not accepted for provisioning otherwise. Bump the
  VHD creator tool version and the version of mkimg to signify our
  success in provisioning.
  
  Note that this also imapcts the dynamic VHD images.
  
  Tested by: gjb@

Modified:
  head/usr.bin/mkimg/Makefile
  head/usr.bin/mkimg/vhd.c

Modified: head/usr.bin/mkimg/Makefile
==============================================================================
--- head/usr.bin/mkimg/Makefile	Sun Jun 21 01:55:01 2015	(r284657)
+++ head/usr.bin/mkimg/Makefile	Sun Jun 21 02:45:31 2015	(r284658)
@@ -6,7 +6,7 @@ PROG=	mkimg
 SRCS=	format.c image.c mkimg.c scheme.c
 MAN=	mkimg.1
 
-MKIMG_VERSION=20150222
+MKIMG_VERSION=20150620
 mkimg.o: Makefile
 
 CFLAGS+=-DMKIMG_VERSION=${MKIMG_VERSION}

Modified: head/usr.bin/mkimg/vhd.c
==============================================================================
--- head/usr.bin/mkimg/vhd.c	Sun Jun 21 01:55:01 2015	(r284657)
+++ head/usr.bin/mkimg/vhd.c	Sun Jun 21 02:45:31 2015	(r284658)
@@ -81,9 +81,9 @@ struct vhd_footer {
 	uint32_t	creator_tool;
 #define	VHD_CREATOR_TOOL	0x2a696d67	/* FreeBSD mkimg */
 	uint32_t	creator_version;
-#define	VHD_CREATOR_VERSION	0x00010000
+#define	VHD_CREATOR_VERSION	0x00020000
 	uint32_t	creator_os;
-#define	VHD_CREATOR_OS		0x46425344
+#define	VHD_CREATOR_OS		0x5769326b	/* Wi2k */
 	uint64_t	original_size;
 	uint64_t	current_size;
 	struct vhd_geom	geometry;