From 4441b8c9e60ef1f87bd9e8d94207fa3f57a27184 Mon Sep 17 00:00:00 2001 From: DemitasseNZ Date: Tue, 26 Jul 2016 10:13:30 +1200 Subject: [PATCH] Add gParted to PXE, View 7.0 Hopefully both working now --- Build/Automate/CS1/Build.ps1 | 7 +++++++ Build/Automate/CS2/Build.ps1 | 6 ++++++ Build/Automate/DC/Phase2.ps1 | 18 ++++++++++++++++++ Build/Automate/PXEMenuConfig.ps1 | 12 ++++++------ Build/Automate/SS/Build.ps1 | 6 ++++++ Build/Automate/VC/Build.ps1 | 14 ++++++++++++-- Build/gparted/ReadMe.txt | 7 +++++++ 7 files changed, 62 insertions(+), 8 deletions(-) create mode 100644 Build/gparted/ReadMe.txt diff --git a/Build/Automate/CS1/Build.ps1 b/Build/Automate/CS1/Build.ps1 index 0f6536a..93ff214 100644 --- a/Build/Automate/CS1/Build.ps1 +++ b/Build/Automate/CS1/Build.ps1 @@ -29,6 +29,7 @@ If (([System.Environment]::OSVersion.Version.Major -eq 6) -and ([System.Environm Netsh firewall set service RemoteAdmin Netsh advfirewall set currentprofile settings remotemanagement enable } + $Files = get-childitem "b:\view$viewinstall" for ($i=0; $i -lt $files.Count; $i++) { If ($Files[$i].Name -like "VMware-viewconnectionserver*") {$Installer = $Files[$i].FullName} @@ -63,6 +64,12 @@ Switch ($ViewInstall) { Start-Process C:\ViewInstaller.exe -wait -ArgumentList '/s /v"/qn VDM_SERVER_INSTANCE_TYPE=1 FWCHOICE=1 VDM_INITIAL_ADMIN_SID=S-1-5-32-544 VDM_SERVER_RECOVERY_PWD=VMware1 VDM_SERVER_RECOVERY_PWD_REMINDER=First"' C:\Windows\Microsoft.NET\Framework64\v2.0.50727\InstallUtil.exe "C:\Program Files\VMware\VMware View\Server\bin\PowershellServiceCmdlets.dll" >> c:\buildLog.txt } + 70 { + Write-BuildLog "Install View 7.0 Connection Server" + copy $Installer C:\ViewInstaller.exe + Start-Process C:\ViewInstaller.exe -wait -ArgumentList '/s /v"/qn VDM_SERVER_INSTANCE_TYPE=1 FWCHOICE=1 VDM_INITIAL_ADMIN_SID=S-1-5-32-544 VDM_SERVER_RECOVERY_PWD=VMware1 VDM_SERVER_RECOVERY_PWD_REMINDER=First"' + C:\Windows\Microsoft.NET\Framework64\v2.0.50727\InstallUtil.exe "C:\Program Files\VMware\VMware View\Server\bin\PowershellServiceCmdlets.dll" >> c:\buildLog.txt + } } Write-BuildLog "Install Flash Player" Start-Process msiexec -wait -ArgumentList " /i b:\Automate\_Common\install_flash_player_11_active_x.msi /qn" diff --git a/Build/Automate/CS2/Build.ps1 b/Build/Automate/CS2/Build.ps1 index 9a052c6..13211f4 100644 --- a/Build/Automate/CS2/Build.ps1 +++ b/Build/Automate/CS2/Build.ps1 @@ -28,12 +28,18 @@ If (([System.Environment]::OSVersion.Version.Major -eq 6) -and ([System.Environm Netsh firewall set service RemoteAdmin Netsh advfirewall set currentprofile settings remotemanagement enable } + if (Test-Path "C:\VMware-view*") { $Files = get-childitem "C:\" for ($i=0; $i -lt $files.Count; $i++) { If ($Files[$i].Name -like "VMware-view*") {$Installer = $Files[$i].FullName} } switch ($viewinstall) { + 70 { + Write-BuildLog "Install View 7.0 Connection Server" + Start-Process $Installer -wait -ArgumentList '/s /v"/qn VDM_SERVER_INSTANCE_TYPE=2 ADAM_PRIMARY_NAME=cs1.lab.local"' -verb RunAs + C:\Windows\Microsoft.NET\Framework64\v2.0.50727\InstallUtil.exe "C:\Program Files\VMware\VMware View\Server\bin\PowershellServiceCmdlets.dll" >> c:\buildLog.txt + } 60 { Write-BuildLog "Install View 6.0 Connection Server" Start-Process $Installer -wait -ArgumentList '/s /v"/qn VDM_SERVER_INSTANCE_TYPE=2 ADAM_PRIMARY_NAME=cs1.lab.local"' diff --git a/Build/Automate/DC/Phase2.ps1 b/Build/Automate/DC/Phase2.ps1 index 10d04db..f5d8e7a 100644 --- a/Build/Automate/DC/Phase2.ps1 +++ b/Build/Automate/DC/Phase2.ps1 @@ -115,6 +115,7 @@ if (Test-Path "B:\ESXi60\*") { Add-Content C:\TFTP-Root\ESXi60\Besx3-60.cfg "kernelopt=ks=nfs://192.168.199.7/mnt/LABVOL/Build/Automate/Hosts/esx3-5.cfg" Get-Content C:\TFTP-Root\ESXi60\BOOT.CFG | %{$_ -replace "/","/ESXi60/"} | Set-Content C:\TFTP-Root\ESXi60\Besx4-60.cfg Add-Content C:\TFTP-Root\ESXi60\\Besx4-60.cfg "kernelopt=ks=nfs://192.168.199.7/mnt/LABVOL/Build/Automate/Hosts/esx4-5.cfg" + Get-Content C:\TFTP-Root\ESXi60\BOOT.CFG | %{$_ -replace "/","/ESXi60/"} | Set-Content C:\TFTP-Root\ESXi60\BOOT.CFG powershell C:\PXEMenuConfig.ps1 ESXi60 Write-BuildLog "ESXi 6.0 added to TFTP and PXE menu." Write-BuildLog "" @@ -139,6 +140,7 @@ if (Test-Path "B:\ESXi55\*") { Add-Content C:\TFTP-Root\ESXi55\Besx3-55.cfg "kernelopt=ks=nfs://192.168.199.7/mnt/LABVOL/Build/Automate/Hosts/esx3-5.cfg" Get-Content C:\TFTP-Root\ESXi55\BOOT.CFG | %{$_ -replace "/","/ESXi55/"} | Set-Content C:\TFTP-Root\ESXi55\Besx4-55.cfg Add-Content C:\TFTP-Root\ESXi55\\Besx4-55.cfg "kernelopt=ks=nfs://192.168.199.7/mnt/LABVOL/Build/Automate/Hosts/esx4-5.cfg" + Get-Content C:\TFTP-Root\ESXi55\BOOT.CFG | %{$_ -replace "/","/ESXi55/"} | Set-Content C:\TFTP-Root\ESXi55\BOOT.CFG powershell C:\PXEMenuConfig.ps1 ESXi55 Write-BuildLog "ESXi 5.5 added to TFTP and PXE menu." Write-BuildLog "" @@ -163,6 +165,7 @@ if (Test-Path "B:\ESXi51\*") { Add-Content C:\TFTP-Root\ESXi51\Besx3-5.cfg "kernelopt=ks=nfs://192.168.199.7/mnt/LABVOL/Build/Automate/Hosts/esx3-5.cfg" Get-Content C:\TFTP-Root\ESXi51\BOOT.CFG | %{$_ -replace "/","/ESXi51/"} | Set-Content C:\TFTP-Root\ESXi51\Besx4-5.cfg Add-Content C:\TFTP-Root\ESXi51\Besx4-5.cfg "kernelopt=ks=nfs://192.168.199.7/mnt/LABVOL/Build/Automate/Hosts/esx4-5.cfg" + Get-Content C:\TFTP-Root\ESXi51\BOOT.CFG | %{$_ -replace "/","/ESXi51/"} | Set-Content C:\TFTP-Root\ESXi51\BOOT.CFG powershell C:\PXEMenuConfig.ps1 ESXi51 Write-BuildLog "ESXi 5.1 added to TFTP and PXE menu." Write-BuildLog "" @@ -187,6 +190,7 @@ if (Test-Path "B:\ESXi50\*") { Add-Content C:\TFTP-Root\ESXi50\Besx3-5.cfg "kernelopt=ks=nfs://192.168.199.7/mnt/LABVOL/Build/Automate/Hosts/esx3-5.cfg" Get-Content C:\TFTP-Root\ESXi50\BOOT.CFG | %{$_ -replace "/","/ESXi50/"} | Set-Content C:\TFTP-Root\ESXi50\Besx4-5.cfg Add-Content C:\TFTP-Root\ESXi50\Besx4-5.cfg "kernelopt=ks=nfs://192.168.199.7/mnt/LABVOL/Build/Automate/Hosts/esx4-5.cfg" + Get-Content C:\TFTP-Root\ESXi50\BOOT.CFG | %{$_ -replace "/","/ESXi50/"} | Set-Content C:\TFTP-Root\ESXi50\BOOT.CFG powershell C:\PXEMenuConfig.ps1 ESXi50 Write-BuildLog "ESXi 5.0 added to TFTP and PXE menu." Write-BuildLog "" @@ -240,6 +244,20 @@ if (!($esx41 -or $esxi41 -or $esxi50 -or $esxi51 -or $esxi55 -or $esxi60)) { Write-BuildLog "Restart this machine when Build share is available; build will proceed after restart." exit } + +if (Test-Path "B:\gParted\*") { + Write-BuildLog "Adding gParted to PXE build" + $null = $null = New-Item -Path C:\TFTP-Root\gParted -ItemType Directory -Force -Confirm:$false + xcopy B:\gParted\*.* C:\TFTP-Root\gParted /s /c /y /q + Add-Content -Path "C:\TFTP-Root\pxelinux.cfg\default" -Value @" + +LABEL gParted + MENU LABEL gParted utility + kernel gparted/vmlinuz + append initrd=gparted/initrd.img boot=live config components union=overlay username=user noswap noeject ip= vga=788 fetch=tftp://192.168.199.4/gparted/filesystem.squashfs +"@ +} + Write-BuildLog "Checking for vCenter files..." if (Test-Path "B:\VIM_60\*") { if ((Test-Path "B:\VIM_60\*.iso") -and !(Test-Path "B:\VIM_60\autorun.exe")){ diff --git a/Build/Automate/PXEMenuConfig.ps1 b/Build/Automate/PXEMenuConfig.ps1 index 10794cc..69bae25 100644 --- a/Build/Automate/PXEMenuConfig.ps1 +++ b/Build/Automate/PXEMenuConfig.ps1 @@ -27,7 +27,7 @@ switch ($version) { Add-Content -Path "C:\buildlog.txt" -Value "Adding ESXi 6.0 option to PXE menu" Add-Content -Path "C:\TFTP-Root\pxelinux.cfg\default" -Value @" -LABEL Fixes Menu +LABEL ESXi 60 MENU LABEL ESXi 6.0 automated builds KERNEL pxelinux.cfg/menu.c32 APPEND pxelinux.cfg/ESXi60.menu @@ -41,7 +41,7 @@ LABEL Fixes Menu Add-Content -Path "C:\buildlog.txt" -Value "Adding ESXi 5.5 option to PXE menu" Add-Content -Path "C:\TFTP-Root\pxelinux.cfg\default" -Value @" -LABEL Fixes Menu +LABEL ESXi 5.5 MENU LABEL ESXi 5.5 automated builds KERNEL pxelinux.cfg/menu.c32 APPEND pxelinux.cfg/ESXi55.menu @@ -55,7 +55,7 @@ LABEL Fixes Menu Add-Content -Path "C:\buildlog.txt" -Value "Adding ESXi 5.1 option to PXE menu" Add-Content -Path "C:\TFTP-Root\pxelinux.cfg\default" -Value @" -LABEL Fixes Menu +LABEL ESXi 5.1 MENU LABEL ESXi 5.1 automated builds KERNEL pxelinux.cfg/menu.c32 APPEND pxelinux.cfg/ESXi51.menu @@ -69,7 +69,7 @@ LABEL Fixes Menu Add-Content -Path "C:\buildlog.txt" -Value "Adding ESXi 5.0 option to PXE menu" Add-Content -Path "C:\TFTP-Root\pxelinux.cfg\default" -Value @" -LABEL Fixes Menu +LABEL ESXi 5.0 MENU LABEL ESXi 5.0 automated builds KERNEL pxelinux.cfg/menu.c32 APPEND pxelinux.cfg/ESXi50.menu @@ -81,7 +81,7 @@ LABEL Fixes Menu Add-Content -Path "C:\buildlog.txt" -Value "Adding ESXi 4.1 option to PXE menu" Add-Content -Path "C:\TFTP-Root\pxelinux.cfg\default" -Value @" -LABEL Fixes Menu +LABEL ESXi 4.1 MENU LABEL ESXi 4.1 automated builds KERNEL pxelinux.cfg/menu.c32 APPEND pxelinux.cfg/ESXi41.menu @@ -117,7 +117,7 @@ label esx2-4 Add-Content -Path "C:\buildlog.txt" -Value "Adding vCloud option to PXE menu" Add-Content -Path "C:\TFTP-Root\pxelinux.cfg\default" -Value @" -LABEL Fixes Menu +LABEL vCloud MENU LABEL vCloud Director automated build KERNEL pxelinux.cfg/menu.c32 APPEND pxelinux.cfg/vCloud.menu diff --git a/Build/Automate/SS/Build.ps1 b/Build/Automate/SS/Build.ps1 index 82bf11d..29373cd 100644 --- a/Build/Automate/SS/Build.ps1 +++ b/Build/Automate/SS/Build.ps1 @@ -28,6 +28,7 @@ If (([System.Environment]::OSVersion.Version.Major -eq 6) -and ([System.Environm Netsh firewall set service RemoteAdmin Netsh advfirewall set currentprofile settings remotemanagement enable } + $Files = get-childitem "b:\view$viewinstall" for ($i=0; $i -lt $files.Count; $i++) { If ($Files[$i].Name -like "VMware-viewconnectionserver*") {$Installer = $Files[$i].FullName} @@ -58,6 +59,11 @@ Switch ($ViewInstall) { copy $Installer C:\ViewInstaller.exe Start-Process C:\ViewInstaller.exe -wait -ArgumentList '/s /v"/qn VDM_SERVER_INSTANCE_TYPE=3 VDM_SERVER_NAME=cs1.lab.local VDM_SERVER_SS_EXTURL=https://SS.lab.local:443 VDM_SERVER_SS_PWD=VMware1! VDM_SERVER_SS_PCOIP_IPADDR=192.168.199.35 VDM_SERVER_SS_PCOIP_TCPPORT=4172 VDM_SERVER_SS_PCOIP_UDPPORT=4172"' } + 70 { + Write-BuildLog "Install View 7.0 Security Server" + copy $Installer C:\ViewInstaller.exe + Start-Process C:\ViewInstaller.exe -wait -ArgumentList '/s /v"/qn VDM_SERVER_INSTANCE_TYPE=3 VDM_SERVER_NAME=cs1.lab.local VDM_SERVER_SS_EXTURL=https://SS.lab.local:443 VDM_SERVER_SS_PWD=VMware1! VDM_SERVER_SS_PCOIP_IPADDR=192.168.199.35 VDM_SERVER_SS_PCOIP_TCPPORT=4172 VDM_SERVER_SS_PCOIP_UDPPORT=4172"' -verb RunAs + } } Write-BuildLog "Install Flash Player" Start-Process msiexec -wait -ArgumentList " /i b:\Automate\_Common\install_flash_player_11_active_x.msi /qn" diff --git a/Build/Automate/VC/Build.ps1 b/Build/Automate/VC/Build.ps1 index f0d68a1..f4c15e1 100644 --- a/Build/Automate/VC/Build.ps1 +++ b/Build/Automate/VC/Build.ps1 @@ -111,7 +111,10 @@ if (Test-Path "C:\VMware-viewcomposer*") { If ($Files[$i].Name -like "VMware-viewcomposer*") {$Installer = $Files[$i].FullName} } switch ($viewinstall) { - 60 { + 70 { + Write-BuildLog "Installing VMware View 7.0 Composer" + Start-Process $Installer -ArgumentList '/s /v" /qn AgreeToLicense="Yes" DB_USERNAME="VMview" DB_PASSWORD="VMware1!" DB_DSN="ViewComposer" REBOOT="ReallySuppress" "' -Wait -Verb RunAs + } 60 { Write-BuildLog "Installing VMware View 6.0 Composer" Start-Process $Installer -ArgumentList '/s /v" /qn AgreeToLicense="Yes" DB_USERNAME="VMview" DB_PASSWORD="VMware1!" DB_DSN="ViewComposer" REBOOT="ReallySuppress" "' -Wait -Verb RunAs } 53 { @@ -464,7 +467,14 @@ If ($viewinstall -ne "None") { } } switch ($viewinstall) { - 60 { + 70 { + if (Test-Path "B:\View70\VMware-viewcomposer-*.exe") { + Write-BuildLog "Setup install VMware View 7.0 Composer, reboot required before install" + copy-item $Installer C:\ + Write-BuildLog "Setup script recall for Phase 2 completion" + reg add HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce /v Build /t REG_SZ /d "cmd /c c:\Build.cmd" /f >> c:\buildlog.txt + } + } 60 { if (Test-Path "B:\View60\VMware-viewcomposer-*.exe") { Write-BuildLog "Setup install VMware View 6.0 Composer, reboot required before install" copy-item $Installer C:\ diff --git a/Build/gparted/ReadMe.txt b/Build/gparted/ReadMe.txt new file mode 100644 index 0000000..430f1d2 --- /dev/null +++ b/Build/gparted/ReadMe.txt @@ -0,0 +1,7 @@ +To have gParted addedto PXE menu place teh following fiels here before the DC build + +filesystem.squashfs +initrd.img +vmlinuz + +These files are in the Live folder inside the gParted ISO \ No newline at end of file