From 094aee795f2f9ab34f971ef037e8fe4fe26de77c Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Mon, 25 Mar 2013 19:37:36 +0000 Subject: [PATCH] Fix issues with previous commit git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@15660 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/windows.pm | 6 +++--- xCAT-server/share/xcat/netboot/windows/nextdestiny.ps1 | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/windows.pm b/xCAT-server/lib/xcat/plugins/windows.pm index 8c19fa01a..8df86ef51 100644 --- a/xCAT-server/lib/xcat/plugins/windows.pm +++ b/xCAT-server/lib/xcat/plugins/windows.pm @@ -471,9 +471,9 @@ sub mkinstall print $shandle ":x64\r\n"; print $shandle "%instdrv%\\postscripts\\upflagx64 %XCATD% 3002 next\r\n"; print $shandle "GOTO END\r\n"; - print $shandle ":PSH\n"; - print $shandle "set mastername=$xcatsslname\n"; - print $shandle "set master=%XCATD%\n"; + print $shandle ":PSH\r\n"; + print $shandle "set mastername=$xcatsslname\r\n"; + print $shandle "set master=%XCATD%\r\n"; print $shandle "mkdir x:\\windows\\system32\\WindowsPowerShell\\v1.0\\Modules\\xCAT\r\n"; print $shandle "copy %instdrv%\\utils\\windows\\xCAT.* x:\\windows\\system32\\WindowsPowerShell\\v1.0\\Modules\\xCAT\r\n"; print $shandle "powershell set-executionpolicy bypass CurrentUser\r\n"; diff --git a/xCAT-server/share/xcat/netboot/windows/nextdestiny.ps1 b/xCAT-server/share/xcat/netboot/windows/nextdestiny.ps1 index 0a85b3029..e3d18dd97 100644 --- a/xCAT-server/share/xcat/netboot/windows/nextdestiny.ps1 +++ b/xCAT-server/share/xcat/netboot/windows/nextdestiny.ps1 @@ -2,7 +2,7 @@ $command=@{'command'='nextdestiny'} if (!(Test-Path HKCU:\Software\xCAT)) { mkdir HKCU:\Software\xCAT $certstore = New-Object System.Security.Cryptography.X509Certificates.X509Store("My","CurrentUser") - $certstore.Open([System.Security.Cryptopgraphy.X509Certificates.OpenFlags]'Readwrite') + $certstore.Open([System.Security.Cryptography.X509Certificates.OpenFlags]'Readwrite') $cacert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2("$env:instdrv\xcat\ca.pem") Set-ItemProperty HKCU:\Software\xCAT cacertthumb $cacert.thumbprint Set-ItemProperty HKCU:\Software\xCAT serveraddress $env:master