From 7c92ec0bd1e51fef193d04e4dfc7f69e5bec3912 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Tue, 22 Jun 2010 20:50:07 +0000 Subject: [PATCH] -Have BCD/B32 BCD naming convention in place -Rectify fixup of DUID-UUID concept git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6582 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/share/xcat/netboot/windows/genimage.bat | 3 +++ xCAT-server/share/xcat/netboot/windows/startnet.cmd | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/xCAT-server/share/xcat/netboot/windows/genimage.bat b/xCAT-server/share/xcat/netboot/windows/genimage.bat index 89f6fa25b..16d78bf2f 100644 --- a/xCAT-server/share/xcat/netboot/windows/genimage.bat +++ b/xCAT-server/share/xcat/netboot/windows/genimage.bat @@ -32,6 +32,9 @@ bcdedit /store c:\WinPE_%SUFFIX%\pxe\Boot\BCD.%SUFFIX% /create {bootmgr} /d "xCA bcdedit /store c:\WinPE_%SUFFIX%\pxe\Boot\BCD.%SUFFIX% /set {bootmgr} timeout 1 bcdedit /store c:\WinPE_%SUFFiX%\pxe\Boot\BCD.%SUFFIX% /set {bootmgr} displayorder %GUID% bcdedit /store c:\WinPE_%SUFFIX%\pxe\Boot\BCD.%SUFFIX% +if [%ARCH%] EQU [x86] copy c:\WinPE_%SUFFIX%\pxe\Boot\BCD.%SUFFIX% c:\WinPE_%SUFFIX%\pxe\Boot\B32 +if [%ARCH%] EQU [amd64] copy c:\WinPE_%SUFFIX%\pxe\Boot\BCD.%SUFFIX% c:\WinPE_%SUFFIX%\pxe\Boot\BCD + dism /mount-wim /wimfile:c:\WinPE_%SUFFIX%\pxe\Boot\winpe_%SUFFIX%.wim /index:1 /mountdir:c:\WinPE_%SUFFIX%\rootfs copy startnet.cmd c:\WinPE_%SUFFIX%\rootfs\Windows\system32 diff --git a/xCAT-server/share/xcat/netboot/windows/startnet.cmd b/xCAT-server/share/xcat/netboot/windows/startnet.cmd index cd53fcf43..a63f63abb 100644 --- a/xCAT-server/share/xcat/netboot/windows/startnet.cmd +++ b/xCAT-server/share/xcat/netboot/windows/startnet.cmd @@ -2,7 +2,7 @@ echo Initializing, please wait. FOR /F "tokens=*" %%A IN ('wmic csproduct get uuid /Format:list ^| FIND "="') DO SET %%A set guid=%uuid:~6,2%%uuid:~4,2%%uuid:~2,2%%uuid:~0,2%-%uuid:~11,2%%uuid:~9,2%-%uuid:~16,2%%uuid:~14,2%%uuid:~18,18% -echo Windows Registry Editor Version 5 >> duiduuid.reg +echo REGEDIT4 >> duiduuid.reg echo. >> duiduuid.reg echo [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\TCPIP6\Parameters] >> duiduuid.reg echo "Dhcpv6DUID"=hex:00,04,%guid:~0,2%,%guid:~2,2%,%guid:~4,2%,%guid:~6,2%,%guid:~9,2%,%guid:~11,2%,%guid:~14,2%,%guid:~16,2%,%guid:~19,2%,%guid:~21,2%,%guid:~24,2%,%guid:~26,2%,%guid:~28,2%,%guid:~30,2%,%guid:~32,2%,%guid:~34,2% >> duiduuid.reg