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;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
