From 8b37e7ca92934197c838c4239d0e4d889fbbe4e7 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Sun, 21 Jun 2015 02:45:31 +0000 Subject: [PATCH] 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@ --- usr.bin/mkimg/Makefile | 2 +- usr.bin/mkimg/vhd.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.bin/mkimg/Makefile b/usr.bin/mkimg/Makefile index d6359242c29..0ece0823577 100644 --- a/usr.bin/mkimg/Makefile +++ b/usr.bin/mkimg/Makefile @@ -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} diff --git a/usr.bin/mkimg/vhd.c b/usr.bin/mkimg/vhd.c index 404075225f8..054f82facd8 100644 --- a/usr.bin/mkimg/vhd.c +++ b/usr.bin/mkimg/vhd.c @@ -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;