From: Eric Biggers Date: Sat, 8 Aug 2015 20:05:59 +0000 (-0500) Subject: Update references to specific Windows versions X-Git-Tag: v1.8.2~12 X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=0745767c5cc39f668b35a21d5260fae6c88f28d9 Update references to specific Windows versions - Say "Vista" and later instead of listing specific versions - Prefer "ISO" to "DVD" --- diff --git a/README b/README index f5ba0b89..b576eaa4 100644 --- a/README +++ b/README @@ -190,10 +190,10 @@ platform-dependent way: For both platforms the code for NTFS capture and extraction is complete enough that it is possible to apply an image from the "install.wim" contained in recent -Windows installation media (Vista, Windows 7, or Windows 8) directly to an NTFS -filesystem, and then boot Windows from it after preparing the Boot Configuration -Data. In addition, a Windows installation can be captured (or backed up) into a -WIM file, and then re-applied later. +Windows installation media (Vista or later) directly to an NTFS filesystem, and +then boot Windows from it after preparing the Boot Configuration Data. In +addition, a Windows installation can be captured (or backed up) into a WIM file, +and then re-applied later. WINDOWS PE @@ -207,12 +207,11 @@ and can be used to install Windows from local media or a network drive or perform maintenance. It is the operating system that runs when you boot from the Windows installation media. -You can find Windows PE on the installation DVD for Windows Vista, Windows 7, or -Windows 8, in the file `sources/boot.wim'. Windows PE can also be found in the -Windows Automated Installation Kit (WAIK), which is free to download from -Microsoft, inside the `WinPE.cab' file, which you can extract natively on -Windows, or on UNIX-like systems if you install either the `cabextract' or -`p7zip' programs. +You can find Windows PE on the installation media for Windows (Vista or later) +as the file `sources/boot.wim'. Windows PE can also be found in the Windows +Automated Installation Kit (WAIK), which is free to download from Microsoft, +inside the `WinPE.cab' file, which you can extract natively on Windows, or on +UNIX-like systems if you install either the `cabextract' or `p7zip' programs. In addition, Windows installations and recovery partitions frequently contain a WIM containing an image of the Windows Recovery Environment, which is similar to diff --git a/doc/man1/mkwinpeimg.1 b/doc/man1/mkwinpeimg.1 index ae191b81..8c214229 100644 --- a/doc/man1/mkwinpeimg.1 +++ b/doc/man1/mkwinpeimg.1 @@ -6,21 +6,20 @@ mkwinpeimg \- Make a customized bootable image of Windows PE [\fIOPTIONS\fR] \fIIMAGE\fR .SH DESCRIPTION \fBmkwinpeimg\fR is able to make a bootable image of Windows PE by taking files -from a mounted Windows DVD (Windows Vista, Windows 7 or Windows 8) or the -mounted ISO image for the Windows Automated Installation Kit (WAIK) or the WAIK -supplement. The -\fB--windows-dir\fR and \fB--waik-dir\fR options are used to specify the -locations of these mounted ISOs. You only need one or the other. The files -that \fBmkwinpeimg\fR will retrieve are \fIboot.wim\fR, \fIbootmgr\fR, +from a mounted Windows installation ISO image (Vista or later) or the mounted +ISO image for the Windows Automated Installation Kit (WAIK) or the WAIK +supplement. The \fB--windows-dir\fR and \fB--waik-dir\fR options are used to +specify the locations of these mounted ISOs. You only need one or the other. +The files that \fBmkwinpeimg\fR will retrieve are \fIboot.wim\fR, \fIbootmgr\fR, \fIboot.sdi\fR, and \fIbcd\fR. If making an ISO image, the file \fIetfsboot.com\fR is also retrieved. Microsoft owns the rights to these files and they are not distributed with wimlib. .PP -\fBmkwinpeimg\fR can currently make two types of bootable images. The default -is to make a bootable disk image. The image is not partitioned and is formatted -into a FAT filesystem. \fBsyslinux\fR(1) is required to make this type of -image, as it is used to chainload \fIbootmgr\fR. Also, \fBmtools\fR(1) is -required so that the FAT filesystem can be created without root privileges. +\fBmkwinpeimg\fR can make two types of bootable images. The default is to make +a bootable disk image. The image is not partitioned and is formatted into a FAT +filesystem. \fBsyslinux\fR(1) is required to make this type of image, as it is +used to chainload \fIbootmgr\fR. Also, \fBmtools\fR(1) is required so that the +FAT filesystem can be created without root privileges. .PP The other type of bootable image that \fBmkwinpeimg\fR can make is a bootable ISO image. To make this type of image, give the \fB--iso\fR option. @@ -44,10 +43,6 @@ option. However, for more extensive modifications, consider modifying the .PP \fBmkwinpeimg\fR can also make only a modified \fIboot.wim\fR, rather than a bootable ISO or disk image, if the \fB--only-wim\fR option is given. -.PP -The Windows PE WIMs provided in Windows 7, Windows 8, and the WAIK are not the -same, but are all similar. The best one to use is likely the one from the WAIK, -as that one is the smallest. .SH OPTIONS .TP 6 \fB\-i\fR, \fB\-\-iso\fR @@ -58,12 +53,14 @@ Make neither a disk image nor an ISO image; instead, only make a modified \fIboot.wim\fR file. .TP \fB\-W\fR, \fB\-\-windows\-dir\fR=\fIDIR\fR -Use DIR as the location of the mounted Windows 7 or Windows 8 DVD. Default is -/mnt/windows, then /mnt/windows7, then /mnt/windows8. +Use DIR as the location of the mounted Windows installation ISO image. If +neither \fB\-\-windows\-dir\fR nor \fB\-\-waik\-dir\fR is specified, then +the script looks for the mounted ISO in the following default locations: +/mnt/windows, /mnt/windows7, /mnt/windows8, and /mnt/windows10. .TP \fB\-A\fR, \fB\-\-waik\-dir\fR=\fIDIR\fR Get the boot files and boot.wim from the ISO of the Windows Automated -Installation Kit mounted on DIR instead of from the Windows 7 or Windows 8 DVD. +Installation Kit mounted on DIR instead of from a Windows installation ISO. This also works if the mounted ISO is for the WAIK supplement rather than the WAIK itself. .TP @@ -73,7 +70,7 @@ Add FILE to the root directory of Windows PE image and adjust .TP \fB\-w\fR, \fB\-\-wim\fR=\fIWIM\fR Use WIM as the "boot.wim" file. This defaults to the appropriate WIM file from -the Windows DVD, WAIK, or WAIK supplement. +the Windows ISO, WAIK, or WAIK supplement. .TP \fB\-O\fR, \fB\-\-overlay\fR=\fIDIR\fR Adds all the files in DIR to the Windows PE image. @@ -94,7 +91,7 @@ Display help. \fB\-v\fR, \fB\-\-version\fR Show version information. .SH EXAMPLES -Create a bootable disk image of Windows PE from the Windows Vista, 7, or 8 +Create a bootable disk image of Windows PE from the Windows (Vista or later) installation media mounted on /media/windows: .RS .PP diff --git a/programs/mkwinpeimg.in b/programs/mkwinpeimg.in index f95e8e96..c74b9d42 100755 --- a/programs/mkwinpeimg.in +++ b/programs/mkwinpeimg.in @@ -87,20 +87,23 @@ Usage: $script_name [OPTIONS] IMAGE -i, --iso Make an ISO image instead of a disk image. -o, --only-wim Make neither a disk image nor an ISO image; instead, only make a modified boot.wim file. - -W, --windows-dir=DIR Use DIR as the location of the mounted Windows 7 - or Windows 8 DVD. Default is /mnt/windows, - then /mnt/windows7, then /mnt/windows8. - -A, --waik-dir=DIR Get the boot files and boot.wim from the ISO of the - Windows Automated Installation Kit mounted on DIR - instead of from the Windows 7 or Windows 8 DVD. - This also works if the mounted ISO is for the - WAIK supplement rather than the WAIK itself. + -W, --windows-dir=DIR Use DIR as the location of the mounted Windows + installation ISO image. If not specified, then + the script tries the following locations: + /mnt/windows, /mnt/windows7, /mnt/windows8, + /mnt/windows10. + -A, --waik-dir=DIR Get the boot files and boot.wim from the ISO image + of the Windows Automated Installation Kit (WAIK) + mounted on DIR instead of from a Windows + installation ISO. This also works if the mounted + ISO is for the WAIK supplement rather than for the + WAIK itself. -s, --start-script=FILE Add FILE to the root directory of Windows PE image and adjust \Windows\System32\winpeshl.ini to execute FILE when Windows PE starts up. -w, --wim=WIM Use WIM as the boot.wim file. This defaults to the - appropriate WIM file from the Windows DVD, WAIK, - or WAIK supplement. + appropriate WIM file from the Windows or WAIK + directory. -O, --overlay=DIR Adds all the files in DIR to the Windows PE image. -t, --tmp-dir=DIR Use DIR as the temporary base of the ISO filesystem. Defaults to making one using "mktemp -d". @@ -227,7 +230,9 @@ process_command_line() { find_windows_dir() { if [ -z "$windows_dir_specified" ]; then - for windows_dir in /mnt/windows /mnt/windows7 /mnt/windows8; do + for windows_dir in /mnt/windows /mnt/windows7 \ + /mnt/windows8 /mnt/windows10; \ + do if [ -d "$windows_dir"/sources ]; then break fi @@ -236,8 +241,8 @@ find_windows_dir() { if [ ! -d "$windows_dir" ]; then if [ -z "$windows_dir_specified" ]; then cat 1>&2 << EOF -ERROR: Could not find the directory that the Windows 7 or 8 ISO image is mounted -on! Please specify this directory using the --windows-dir option. +ERROR: Could not find the directory that the Windows (Vista or later) ISO image +is mounted on! Please specify this directory using the --windows-dir option. EOF else echo 1>&2 "ERROR: Could not find the directory \"$windows_dir\"!" @@ -246,8 +251,9 @@ EOF fi if [ ! -d "$windows_dir/sources" ]; then cat 1>&2 << EOF -ERROR: The directory "$windows_dir" exists, but it seems that the Windows 7 or 8 -ISO image is not mounted on it. Please mount the image to continue. +ERROR: The directory "$windows_dir" exists, but it seems that a Windows +(Vista or later) installation ISO image is not mounted on it. Please mount +the image to continue. EOF exit 1 fi @@ -341,7 +347,7 @@ get_primary_boot_files() { else # Get boot files from the Windows ISO - stat_busy "Copying primary boot files from mounted Windows DVD ($windows_dir)" + stat_busy "Copying primary boot files from mounted Windows ISO ($windows_dir)" if [ $make = iso ]; then cp "$windows_dir"/boot/etfsboot.com "$tmp_dir" || stat_fail fi @@ -354,11 +360,11 @@ get_primary_boot_files() { get_boot_wim() { boot_wim="$1" # Copy the WIM over, or export the 2nd image in the WIM in the case of boot.wim - # from the Windows DVD. + # from the Windows ISO. remove_setup= if [ -z "$wim" ]; then - # WIM file unspecified- grab it from the WAIK or the Windows DVD + # WIM file unspecified- grab it from the WAIK or the Windows ISO if [ -n "$waik_dir" ]; then # WAIK if [ -f "$waik_dir/WinPE.cab" ]; then @@ -373,7 +379,7 @@ get_boot_wim() { fi stat_done else - # Windows DVD + # Windows ISO remove_setup=yes wim="$windows_dir/sources/boot.wim" stat_busy "Exporting image from \"$wim\""