Update version to 1.2.4; update NEWS

[wimlib] / programs / mkwinpeimg

diff --git a/programs/mkwinpeimg b/programs/mkwinpeimg
index 3075c28d112f31bbe1310569bb219709e8fb3c94..def484f784014a7b5573e6d29acca738ca67f08f 100755 (executable)
--- a/programs/mkwinpeimg
+++ b/programs/mkwinpeimg
@@ -20,7 +20,7 @@
 
 script_name="$(basename $0)"
 PREFIX_REG="::"
-WIMLIB_VERSION=1.2.3
+WIMLIB_VERSION=1.2.4
 
 calc_columns () {
        STAT_COL=80
@@ -108,7 +108,7 @@ Usage: $script_name [OPTIONS] IMAGE
                               Defaults to making one using "mktemp -d".
   -a, --arch=ARCH          Use the Windows PE version from the WAIK that has
                               the CPU architecture ARCH.  Possible values:
-                              "x86", "amd64", or "ia64".  Default is "x86".
+                              "x86" or "amd64".  Default is "x86".
   -h, --help               Display this information.
   -v, --version            Show version information.
 
@@ -183,14 +183,17 @@ process_command_line() {
                        if [ "$2" == "x86" ]; then
                                arch="X86"
                                arch_id="1"
-                       elif [ "$2" == "ia64" ]; then
-                               arch="IA64"
-                               arch_id="2"
+                       # Need to test Itanium images before making it an
+                       # option.  Note: syslinux is x86 only so can't be used
+                       # for the Itanium disk image.
+                       #elif [ "$2" == "ia64" ]; then
+                               #arch="IA64"
+                               #arch_id="2"
                        elif [ "$2" == "amd64" ]; then
                                arch="AMD64"
                                arch_id="3"
                        else 
-                               echo "ERROR: $2 is not a valid arch (x86/amd64/ia64)"
+                               echo "ERROR: $2 is not a valid arch (x86/amd64)"
                                exit 1
                        fi
                        shift
@@ -420,7 +423,7 @@ make_iso_img() {
 
        stat_busy "Making ISO image \"$image\""
 
-       mkisofs -sysid ""  -A ""  -V "Microsoft Windows PE (x86)"  -d -N \
+       mkisofs -sysid ""  -A ""  -V "Microsoft Windows PE ($arch)"  -d -N \
                -b etfsboot.com  -no-emul-boot   -c boot.cat  -hide etfsboot.com  \
                -hide boot.cat -quiet -o "$image" "$tmp_dir" || stat_fail