X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=images%2Fguest-aux%2Fmake-windows-img.sh;h=3acb2b7fac8c6cc51e78addcb708424f99a3c6bc;hb=a6f99dd9326c2da66f6b7e49d94901fffdddd6ea;hp=5a0cd6de76a6c0b0eeb2132c46aec87a9cd43626;hpb=fcc631dedb894379cde01af563df3f6a364db7cb;p=libguestfs.git

diff --git a/images/guest-aux/make-windows-img.sh b/images/guest-aux/make-windows-img.sh
index 5a0cd6d..3acb2b7 100755
--- a/images/guest-aux/make-windows-img.sh
+++ b/images/guest-aux/make-windows-img.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -
 # libguestfs
-# Copyright (C) 2010 Red Hat Inc.
+# Copyright (C) 2010-2011 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,8 +21,22 @@
 export LANG=C
 set -e
 
+# If the currently compiled libguestfs doesn't support
+# ntfs-3g/ntfsprogs then we cannot create a Windows phony image.
+# Nothing actually uses windows.img in the standard build so we can
+# just 'touch' it and emit a warning.
+if ! ../run ../fish/guestfish -a /dev/null run : available "ntfs3g ntfsprogs"; then
+  echo "***"
+  echo "Warning: cannot create windows.img because there is no NTFS"
+  echo "support in this build of libguestfs.  Just touching the output"
+  echo "file instead."
+  echo "***"
+  touch windows.img
+  exit 0
+fi
+
 # Create a disk image.
-../fish/guestfish <<'EOF'
+../run ../fish/guestfish <<'EOF'
 sparse windows.img.tmp 512M
 run
 
@@ -31,6 +45,9 @@ part-init /dev/sda mbr
 part-add /dev/sda p 64     524287
 part-add /dev/sda p 524288    -64
 
+# Disk ID.
+pwrite-device /dev/sda "1234" 0x01b8
+
 # Phony boot loader filesystem.
 mkfs ntfs /dev/sda1