[Spice-devel] [nsis] Fix driver path for win2k*

[Yedidyah Bar David]

On Thu, Jan 26, 2017 at 9:47 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> On the virtio-win ISO, the win2k* drivers are in a path of the form
> '2k*', while the installer is looking for them in 'w2k*', and thus
> failing.
> This commit fixes the various paths
>
> This should fix https://bugzilla.redhat.com/show_bug.cgi?id=1416533 and
> https://bugzilla.redhat.com/show_bug.cgi?id=1416579
> ---
>  win-guest-tools.nsis | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/win-guest-tools.nsis b/win-guest-tools.nsis
> index 5f212f7..288e8a3 100644
> --- a/win-guest-tools.nsis
> +++ b/win-guest-tools.nsis
> @@ -288,17 +288,17 @@ Function GetDriverSubdir
>     ${ElseIf} ${IsWin7}
>        StrCpy $0 "$0\w7"
>     ${ElseIf} ${IsWin2008}
> -      StrCpy $0 "$0\w2k8"
> +      StrCpy $0 "$0\2k8"
>     ${ElseIf} ${IsWin2008R2}
> -      StrCpy $0 "$0\w2k8R2"
> +      StrCpy $0 "$0\2k8R2"
>     ${ElseIf} ${IsWin8}
>        StrCpy $0 "$0\w8"
>     ${ElseIf} ${IsWin2012}
> -      StrCpy $0 "$0\w2k12"
> +      StrCpy $0 "$0\2k12"
>     ${ElseIf} ${IsWin8.1}
>        StrCpy $0 "$0\w8.1"
>     ${ElseIf} ${IsWin2012R2}
> -      StrCpy $0 "$0\w2k12r2"
> +      StrCpy $0 "$0\2k12r2"
>     ${ElseIf} ${IsWin10}
>        StrCpy $0 "$0\w10"
>     ${Else}
> --
> 2.9.3
>

Verified on win2k12r2-64 from oVirt jenkins build, looks good to me.
Merged to gitlab and oVirt.

Thanks a lot for the patch!
-- 
Didi