arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix issues with previous commit

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@15658 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso
2013-03-25 19:36:31 +00:00
parent ee48169642
commit 4b2e5beb12
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT-server/lib/xcat/plugins/windows.pm
View File

@@ -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";

2
xCAT-server/share/xcat/netboot/windows/nextdestiny.ps1
View File

@@ -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