diff --git a/.gitignore b/.gitignore index fd08e33..be9340e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libosinfo-0.2.12.tar.gz +SOURCES/libosinfo-0.3.0.tar.gz diff --git a/.libosinfo.metadata b/.libosinfo.metadata index 026cfaf..5954b2b 100644 --- a/.libosinfo.metadata +++ b/.libosinfo.metadata @@ -1 +1 @@ -29882e2d50570c6e188249f13aac59b6611d2443 SOURCES/libosinfo-0.2.12.tar.gz +e5d3ce53f949945df28378284ccab81478c1f7de SOURCES/libosinfo-0.3.0.tar.gz diff --git a/SOURCES/enable-win8.1-win10-express-installation.patch b/SOURCES/enable-win8.1-win10-express-installation.patch new file mode 100644 index 0000000..2c761e9 --- /dev/null +++ b/SOURCES/enable-win8.1-win10-express-installation.patch @@ -0,0 +1,1184 @@ +From 82d6687416ead76b5d87a803a41aaf90f5d7c59f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= +Date: Sun, 17 Apr 2016 15:02:26 +0200 +Subject: [PATCH 2/2] Enable win8.1 & win10 express installation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is a squash of the following (yet unreleased after 0.3.0) patches, +to mainly enable the express installation for Windows 8.1 and win10 but +also to improve detection of Windows 8, 8.1 and 10 ISOs and fix related +issues. + +--------------------- + +win8: Add installer-reboots value + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win8.1: Add two more "no variant" volume ids + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win8.1: Add a few more professional volume ids + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win8.1: Adjust the vol-id for enterprise x86 + +Use the same pattern of Volume ids used for enterprise x86_64. + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win8.1: Clean up vol-id entries + +- IR[M135]_CEN?NA_X*FRE is already covered by Enterprise Volume ids. +- IR[M3]_CCSN?A_X*FRE is now covered by No Variant Volume ids. +- IR[M15]_CPRN?A_X*FREV is now covered by Professional Volume Ids. + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win8.1,installer: Tune based on variants + +So, I ended up doing tests with all ISOs that I have access from MSDN +and here is the conclusion: + +Windows 8.1 + Problematic: +  en_windows_8_1_enterprise_debug_checked_x64_dvd_2756358.iso +  en_windows_8_1_enterprise_n_debug_checked_x64_dvd_2942525.iso +  en_windows_8_1_enterprise_n_x64_dvd_2971845.iso +  en_windows_8_1_enterprise_x64_dvd_2971902.iso +  en_windows_8_1_pro_n_vl_x64_dvd_2971969.iso + + Non-problematic: +  en_windows_8_1_n_debug_checked_x64_dvd_2707894.iso +  en_windows_8_1_debug_checked_x64_dvd_2707208.iso +  en_windows_8_1_n_x64_dvd_2707896.iso + +Windows 8.1 with Updates: + Problematic: +  en_windows_8.1_enterprise_n_with_update_x64_dvd_6050225.iso +  en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso +  en_windows_8.1_pro_n_vl_with_update_x64_dvd_6050969.iso +  en_windows_8.1_pro_vl_with_update_x64_dvd_6050880.iso + + Non-problematic: +  en_windows_8.1_n_with_update_x64_dvd_6051677.iso +  en_windows_8.1_with_update_x64_dvd_6051480.iso + +Based on this info, the best way to go is: +- Set the ProductKey during the WindowsPE phase of the setup only in the + following conditions: + - any Windows media that is not Windows 8.1 (as it was before) + - Windows 8.1 media has no variant + - Windows 8.1 media contains on its variant debug but doesn't contain + enterprise on it + + These rules will cover medias with no variant and with "debug" variant + that are not enterprise. All the rest (Enterprise, Enterprise Debug + and Professional) will have the ProductKey skipped during the + WindowsPE phase of the setup. + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win8.1,installer: Force Windows activation + +I've noticed that when installing Windows 8.1 the activation is not done +by the end of the unattended installation and, actually, the serial +number shown in the Activate Windows program is different than the one +used to perform the installation. Also, when tring to activate the +software it fails with the "Windows can't be activate. Try again later" +message and no useful details about the error. + +So, in order to avoid this issue, let's force the activation in the +FirstLogon phase of the installation script by directly editing the +Slmgr.vbs options for Volume Activation. + +For more info about the Slmgr.vbs Options for Volume Activation, please, +take a look on: +https://technet.microsoft.com/en-us/library/dn502540.aspx + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +installer: Use l10n-language as UI language + +Since commit 57b459e09 we set 'EN-US' as UI language instead of 'EN-GB'. +However, this hack is only necessary for Windows 7 and can cause issues +when installing newer versions of the Windows, as the installer, +somehow, gets confused by having different values set to UI language, +System Locale and User Locale and ends up prompting a window for letting +the user to set these values. + +By limiting the hack to Windows 7, this patch fixes the installation of +'EN-GB' ISOs of Windows 8 and 8.1 (the ones tested for now). + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win8.1: Re-enable unattended installation + +Now the unattended installation works properly, apart from the user +avatar not being set for Windows 8 (or newer)[0]. +Due to the Windows policy on hostname and therefore apps might need +to be patched for the installer scripts to work[1]. + +[0]: https://bugzilla.redhat.com/show_bug.cgi?id=1328637 +[1]: https://bugzilla.gnome.org/show_bug.cgi?id=765175 + +This reverts commit 49ae46cda4fbd2e95dc794cb64aec27117351c85. + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win8.1: Add installer-reboots value + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win8: Add enterprise variant + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win8: Add enterprise-debug variant + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win8: Add debug variant + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win8: Add professional variant + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win8: Generalize "No Variant" vol ID expression + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win8,installer: Tune based on variants + +As Windows 8.1, Windows 8 (most likely) has to have the ProductKey +skipped during the WindowsPE phase of the script for the enterprise, +enterprise-debug and professional variants. + +"Most likely" is said because I haven't been able to test the Windows 8 +Professional variant as it needs a VLK and MSDN tells me that only +administrators can access keys in the Volume Licensing Service Center +(VLSC). + +Also, I haven't been able to start an installation using none of the +debug ISOs, as the system reboots just a minute (or so) after booting +up. It seems to be a problem with the ISOs themselves, as I've +downloaded a few ISOs (different locales) and faced the same issue. + +Signed-off-by: Fabiano Fidêncio + +win10: Add an Education x86_64 volume ID + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win10: Generalize "Education" volume ID expression + +Let's generalize the x86 volume ID expression in order to cover more +volume IDs, based on the ones already covered in the x86_64 volume ID +expression. + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win10: Add two Enterprise x86_64 volume IDs + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win10: Generalize "Enterprise" volume ID expression + +Let's generalize the expression for x86 volume IDs in order to cover +more volume IDs. + +The expression is based on the one used for the x86_64 volume IDs. + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win10: Add two Enterprise LTSB (x86_64) volume IDs + +LTSB stands for Long Term Servicing Branch. + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win10: Generalize "Enterprise LTSB" volume ID expression + +Let's generalize the x86 volume ID expression in order to cover more +volume IDs. + +The expression is based on the one used for the x86_64 volume IDs. + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win10: Add two x86_64 volume IDs + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win10: Generalize "No Variant" volume ID expression + +Let's generalize the expression for x86 volume IDs in order to cover +more volume IDs. + +The expression is based on the one used for the x86_64 volume IDs. + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win,installer: Improve "setting product key" logic + +Only a few variants of Windows 8 and Windows 8.1, like Enterprise, +Enterprise Debug and Professional, have to have the ProductKey skipped +during the WindowsPE phase of the installation script. + +This patch re-writes the "skipping ProductKey" logic in a cleaner way, +making it work also for Windows 10 (and all its variants). + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) + +win10: Enable unattended installation + +Unattended installation works properly, apart from the user avatar not +being set for Windows 8 (or newer)[0]. + +[0]: https://bugzilla.redhat.com/show_bug.cgi?id=1328637 + +Signed-off-by: Fabiano Fidêncio +Acked-by: Zeeshan Ali (Khattak) +--- + .../microsoft.com/windows-unattend-desktop.xml.in | 48 +++++++++-- + data/os/microsoft.com/win-10.xml.in | 69 +++++++++++++++- + data/os/microsoft.com/win-8.1.xml.in | 51 ++++++------ + data/os/microsoft.com/win-8.xml.in | 94 +++++++++++++++++++++- + ..._windows_10_education_n_x64_dvd_6847236.iso.txt | 29 +++++++ + ..._enterprise_2015_ltsb_n_x64_dvd_6848316.iso.txt | 29 +++++++ + ...10_enterprise_2015_ltsb_x64_dvd_6848446.iso.txt | 29 +++++++ + ...windows_10_enterprise_n_x64_dvd_6852541.iso.txt | 29 +++++++ + ...n_windows_10_enterprise_x64_dvd_6851151.iso.txt | 29 +++++++ + ...ws_10_multiple_editions_x64_dvd_6846432.iso.txt | 29 +++++++ + ..._10_n_multiple_editions_x64_dvd_6846434.iso.txt | 29 +++++++ + ...ndows_8.1_n_with_update_x64_dvd_6051677.iso.txt | 29 +++++++ + ....1_pro_n_vl_with_update_x64_dvd_6050969.iso.txt | 29 +++++++ + ....1_pro_n_vl_with_update_x86_dvd_6051127.iso.txt | 29 +++++++ + ..._8.1_pro_vl_with_update_x64_dvd_6050880.iso.txt | 29 +++++++ + ..._8.1_pro_vl_with_update_x86_dvd_6050918.iso.txt | 29 +++++++ + ...windows_8.1_with_update_x64_dvd_6051480.iso.txt | 29 +++++++ + 17 files changed, 603 insertions(+), 36 deletions(-) + create mode 100644 test/isodata/windows/win10/en_windows_10_education_n_x64_dvd_6847236.iso.txt + create mode 100644 test/isodata/windows/win10/en_windows_10_enterprise_2015_ltsb_n_x64_dvd_6848316.iso.txt + create mode 100644 test/isodata/windows/win10/en_windows_10_enterprise_2015_ltsb_x64_dvd_6848446.iso.txt + create mode 100644 test/isodata/windows/win10/en_windows_10_enterprise_n_x64_dvd_6852541.iso.txt + create mode 100644 test/isodata/windows/win10/en_windows_10_enterprise_x64_dvd_6851151.iso.txt + create mode 100644 test/isodata/windows/win10/en_windows_10_multiple_editions_x64_dvd_6846432.iso.txt + create mode 100644 test/isodata/windows/win10/en_windows_10_n_multiple_editions_x64_dvd_6846434.iso.txt + create mode 100644 test/isodata/windows/win8.1/en_windows_8.1_n_with_update_x64_dvd_6051677.iso.txt + create mode 100644 test/isodata/windows/win8.1/en_windows_8.1_pro_n_vl_with_update_x64_dvd_6050969.iso.txt + create mode 100644 test/isodata/windows/win8.1/en_windows_8.1_pro_n_vl_with_update_x86_dvd_6051127.iso.txt + create mode 100644 test/isodata/windows/win8.1/en_windows_8.1_pro_vl_with_update_x64_dvd_6050880.iso.txt + create mode 100644 test/isodata/windows/win8.1/en_windows_8.1_pro_vl_with_update_x86_dvd_6050918.iso.txt + create mode 100644 test/isodata/windows/win8.1/en_windows_8.1_with_update_x64_dvd_6051480.iso.txt + +diff --git a/data/install-script/microsoft.com/windows-unattend-desktop.xml.in b/data/install-script/microsoft.com/windows-unattend-desktop.xml.in +index e31df1f..3d58a88 100644 +--- a/data/install-script/microsoft.com/windows-unattend-desktop.xml.in ++++ b/data/install-script/microsoft.com/windows-unattend-desktop.xml.in +@@ -149,9 +149,25 @@ + + + true +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -159,10 +175,24 @@ + + + +- ++ ++ ++ ++ ++ ++ ++ ++ + + +- ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -240,6 +270,13 @@ + Turn Off Network Selection pop-up + cmd /c reg add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" + ++ ++ ++ 2 ++ Force windows activation ++ cmd /c cscript.exe slmgr.vbs /ipk /ato ++ ++ + + + +@@ -249,7 +286,6 @@ + + + +- + + + +diff --git a/data/os/microsoft.com/win-10.xml.in b/data/os/microsoft.com/win-10.xml.in +index 67ef6fe..04facce 100644 +--- a/data/os/microsoft.com/win-10.xml.in ++++ b/data/os/microsoft.com/win-10.xml.in +@@ -17,12 +17,23 @@ + + <_name>Microsoft Windows 10 Enterprise + ++ ++ <_name>Microsoft Windows 10 Enterprise (Long Term Servicing Branch) ++ + + + + + +- J_CEDA_X86FRE_ ++ J_CEDN?A_X86FRE_ ++ MICROSOFT CORPORATION ++ [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*) ++ ++ ++ ++ ++ ++ J_CEDN?A_X64FRE_ + MICROSOFT CORPORATION + [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*) + +@@ -32,7 +43,49 @@ + + + +- J_CENA_X86FREV_ ++ J_CENN?A_X86FREV_ ++ MICROSOFT CORPORATION ++ [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*) ++ ++ ++ ++ ++ ++ J_CENN?A_X64FREV_ ++ MICROSOFT CORPORATION ++ [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*) ++ ++ ++ ++ ++ ++ ++ ++ J_CESN?N?_X86FREV_ ++ MICROSOFT CORPORATION ++ [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*) ++ ++ ++ ++ ++ ++ J_CESN?N?_X64FREV_ ++ MICROSOFT CORPORATION ++ [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*) ++ ++ ++ ++ ++ ++ ++ J_CCSN?A_X86FRE_ ++ MICROSOFT CORPORATION ++ [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*) ++ ++ ++ ++ ++ J_CCSN?A_X64FRE_ + MICROSOFT CORPORATION + [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*) + +@@ -59,5 +112,17 @@ + + + ++ ++ ++