summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcel <marcel@FreeBSD.org>2015-06-21 02:45:31 +0000
committermarcel <marcel@FreeBSD.org>2015-06-21 02:45:31 +0000
commitdd8725551fcdb961ab8ae8697637159722dae6d0 (patch)
treea7ce6a36ecf5bc74007ff907bd6ba219b6d69a60
parentc1f494dd74b926e68102a5479d797ee9e6934622 (diff)
downloadFreeBSD-src-dd8725551fcdb961ab8ae8697637159722dae6d0.zip
FreeBSD-src-dd8725551fcdb961ab8ae8697637159722dae6d0.tar.gz
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@
-rw-r--r--usr.bin/mkimg/Makefile2
-rw-r--r--usr.bin/mkimg/vhd.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/mkimg/Makefile b/usr.bin/mkimg/Makefile
index d635924..0ece082 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 4040752..054f82f 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;
OpenPOWER on IntegriCloud