diff --git a/Build/Automate/BootFloppies/CS1-Config.iso b/Build/Automate/BootFloppies/CS1-Config.iso new file mode 100644 index 0000000..7cf82bc Binary files /dev/null and b/Build/Automate/BootFloppies/CS1-Config.iso differ diff --git a/Build/Automate/BootFloppies/CS2-Config.iso b/Build/Automate/BootFloppies/CS2-Config.iso new file mode 100644 index 0000000..94096b7 Binary files /dev/null and b/Build/Automate/BootFloppies/CS2-Config.iso differ diff --git a/Build/Automate/BootFloppies/DC-Config.iso b/Build/Automate/BootFloppies/DC-Config.iso new file mode 100644 index 0000000..658ac11 Binary files /dev/null and b/Build/Automate/BootFloppies/DC-Config.iso differ diff --git a/Build/Automate/BootFloppies/SS-Config.iso b/Build/Automate/BootFloppies/SS-Config.iso new file mode 100644 index 0000000..bccd507 Binary files /dev/null and b/Build/Automate/BootFloppies/SS-Config.iso differ diff --git a/Build/Automate/BootFloppies/VC-Config.iso b/Build/Automate/BootFloppies/VC-Config.iso new file mode 100644 index 0000000..825dfed Binary files /dev/null and b/Build/Automate/BootFloppies/VC-Config.iso differ diff --git a/Build/Automate/DC/MBOOT.C32 b/Build/Automate/DC/MBOOT.C32 new file mode 100644 index 0000000..c9ba698 Binary files /dev/null and b/Build/Automate/DC/MBOOT.C32 differ diff --git a/Build/Automate/DC/Phase2.ps1 b/Build/Automate/DC/Phase2.ps1 index d5f0472..eb0ce4a 100644 --- a/Build/Automate/DC/Phase2.ps1 +++ b/Build/Automate/DC/Phase2.ps1 @@ -130,6 +130,7 @@ if (Test-Path "B:\ESXi67\*") { Write-BuildLog "ESXi 6.7 found; creating C:\TFTP-Root\ESXi67 and copying ESXi 67 boot files." $null = $null = New-Item -Path C:\TFTP-Root\ESXi67 -ItemType Directory -Force -Confirm:$false xcopy B:\ESXi67\*.* C:\TFTP-Root\ESXi67\ /s /c /y /q + xcopy b:\automate\DC\mboot.c32 C:\TFTP-Root\ESXi67\ /y /q Get-Content C:\TFTP-Root\ESXi67\BOOT.CFG | %{$_ -replace "/","/ESXi67/"} | Set-Content C:\TFTP-Root\ESXi67\Besx1-67.cfg Add-Content C:\TFTP-Root\ESXi67\Besx1-67.cfg "kernelopt=ks=nfs://192.168.199.7/mnt/LABVOL/Build/Automate/Hosts/esx1-5.cfg" Get-Content C:\TFTP-Root\ESXi67\BOOT.CFG | %{$_ -replace "/","/ESXi67/"} | Set-Content C:\TFTP-Root\ESXi67\Besx2-67.cfg @@ -154,6 +155,7 @@ if (Test-Path "B:\ESXi65\*") { Write-BuildLog "ESXi 6.5 found; creating C:\TFTP-Root\ESXi65 and copying ESXi 65 boot files." $null = $null = New-Item -Path C:\TFTP-Root\ESXi65 -ItemType Directory -Force -Confirm:$false xcopy B:\ESXi65\*.* C:\TFTP-Root\ESXi65\ /s /c /y /q + xcopy b:\automate\DC\mboot.c32 C:\TFTP-Root\ESXi65\ /y /q Get-Content C:\TFTP-Root\ESXi65\BOOT.CFG | %{$_ -replace "/","/ESXi65/"} | Set-Content C:\TFTP-Root\ESXi65\Besx1-65.cfg Add-Content C:\TFTP-Root\ESXi65\Besx1-65.cfg "kernelopt=ks=nfs://192.168.199.7/mnt/LABVOL/Build/Automate/Hosts/esx1-5.cfg" Get-Content C:\TFTP-Root\ESXi65\BOOT.CFG | %{$_ -replace "/","/ESXi65/"} | Set-Content C:\TFTP-Root\ESXi65\Besx2-65.cfg @@ -319,7 +321,7 @@ if (Test-Path "B:\gParted\*") { 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://\\dc.lab.local/gparted/filesystem.squashfs + 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 "@ } @@ -515,10 +517,10 @@ netsh dhcp add server dc.lab.local 192.168.199.4 >> C:\DNS.log netsh dhcp server \\dc.lab.local add scope 192.168.199.0 255.255.255.0 "Lab scope" "Scope for lab.local" >> C:\DNS.log netsh dhcp server \\dc.lab.local scope 192.168.199.0 add iprange 192.168.199.100 192.168.199.199 >> C:\DNS.log netsh dhcp server \\dc.lab.local scope 192.168.199.0 set optionvalue 003 IPADDRESS 192.168.199.2 >> C:\DNS.log -netsh dhcp server \\dc.lab.local scope 192.168.199.0 set optionvalue 005 IPADDRESS \\dc.lab.local >> C:\DNS.log -netsh dhcp server \\dc.lab.local scope 192.168.199.0 set optionvalue 006 IPADDRESS \\dc.lab.local >> C:\DNS.log +netsh dhcp server \\dc.lab.local scope 192.168.199.0 set optionvalue 005 IPADDRESS 192.168.199.4 >> C:\DNS.log +netsh dhcp server \\dc.lab.local scope 192.168.199.0 set optionvalue 006 IPADDRESS 192.168.199.4 >> C:\DNS.log netsh dhcp server \\dc.lab.local scope 192.168.199.0 set optionvalue 015 STRING lab.local >> C:\DNS.log -netsh dhcp server \\dc.lab.local scope 192.168.199.0 set optionvalue 066 STRING \\dc.lab.local >> C:\DNS.log +netsh dhcp server \\dc.lab.local scope 192.168.199.0 set optionvalue 066 STRING 192.168.199.4 >> C:\DNS.log netsh dhcp server \\dc.lab.local scope 192.168.199.0 set optionvalue 067 STRING pxelinux.0 >> C:\DNS.log netsh dhcp server \\dc.lab.local scope 192.168.199.0 set state 1 >> C:\DNS.log Write-BuildLog "Checking available SQL Express versions." @@ -532,6 +534,9 @@ if (Test-Path "C:\Program Files\Microsoft SQL Server\100\Tools\Binn\sqlcmd.exe") copy B:\VIM_67\redist\SQLEXPR\SQLEXPR_x64_ENU.exe C:\temp $Arguments = '/IACCEPTSQLSERVERLICENSETERMS /action=Install /FEATURES=SQL,Tools /SQLSYSADMINACCOUNTS="Lab\Domain Admins" /SQLSVCACCOUNT="Lab\vi-admin" /SQLSVCPASSWORD="' + $AdminPWD + '" /AGTSVCACCOUNT="Lab\vi-admin" /AGTSVCPASSWORD="' + $AdminPWD + '" /ADDCURRENTUSERASSQLADMIN /SECURITYMODE=SQL /SAPWD="VMware1!" /INSTANCENAME=SQLExpress /BROWSERSVCSTARTUPTYPE="Automatic" /TCPENABLED=1 /NPENABLED=1 /SQLSVCSTARTUPTYPE=Automatic /q' Start-Process C:\temp\SQLEXPR_x64_ENU.exe -ArgumentList $Arguments -Wait + do { + start-sleep 10 + } until ((get-process "msiexec" -ea SilentlyContinue) -eq $Null) del c:\TEMP\SQLEXPR_x64_ENU.EXE Write-BuildLog "Creating Databases." Start-Process "C:\Program Files\Microsoft SQL Server\110\Tools\Binn\sqlcmd.exe" -ArgumentList "-S dc\SQLEXPRESS -i B:\Automate\DC\MakeDB.txt" -RedirectStandardOutput c:\sqllog.txt -Wait @@ -542,6 +547,9 @@ if (Test-Path "C:\Program Files\Microsoft SQL Server\100\Tools\Binn\sqlcmd.exe") copy B:\VIM_65\redist\SQLEXPR\SQLEXPR_x64_ENU.exe C:\temp $Arguments = '/IACCEPTSQLSERVERLICENSETERMS /action=Install /FEATURES=SQL,Tools /SQLSYSADMINACCOUNTS="Lab\Domain Admins" /SQLSVCACCOUNT="Lab\vi-admin" /SQLSVCPASSWORD="' + $AdminPWD + '" /AGTSVCACCOUNT="Lab\vi-admin" /AGTSVCPASSWORD="' + $AdminPWD + '" /ADDCURRENTUSERASSQLADMIN /SECURITYMODE=SQL /SAPWD="VMware1!" /INSTANCENAME=SQLExpress /BROWSERSVCSTARTUPTYPE="Automatic" /TCPENABLED=1 /NPENABLED=1 /SQLSVCSTARTUPTYPE=Automatic /q' Start-Process C:\temp\SQLEXPR_x64_ENU.exe -ArgumentList $Arguments -Wait + do { + start-sleep 10 + } until ((get-process "msiexec" -ea SilentlyContinue) -eq $Null) del c:\TEMP\SQLEXPR_x64_ENU.EXE Write-BuildLog "Creating Databases." Start-Process "C:\Program Files\Microsoft SQL Server\110\Tools\Binn\sqlcmd.exe" -ArgumentList "-S dc\SQLEXPRESS -i B:\Automate\DC\MakeDB.txt" -RedirectStandardOutput c:\sqllog.txt -Wait @@ -552,6 +560,9 @@ if (Test-Path "C:\Program Files\Microsoft SQL Server\100\Tools\Binn\sqlcmd.exe") copy B:\VIM_60\redist\SQLEXPR\SQLEXPR_x64_ENU.exe C:\temp $Arguments = '/IACCEPTSQLSERVERLICENSETERMS /action=Install /FEATURES=SQL,Tools /SQLSYSADMINACCOUNTS="Lab\Domain Admins" /SQLSVCACCOUNT="Lab\vi-admin" /SQLSVCPASSWORD="' + $AdminPWD + '" /AGTSVCACCOUNT="Lab\vi-admin" /AGTSVCPASSWORD="' + $AdminPWD + '" /ADDCURRENTUSERASSQLADMIN /SECURITYMODE=SQL /SAPWD="VMware1!" /INSTANCENAME=SQLExpress /BROWSERSVCSTARTUPTYPE="Automatic" /TCPENABLED=1 /NPENABLED=1 /SQLSVCSTARTUPTYPE=Automatic /q' Start-Process C:\temp\SQLEXPR_x64_ENU.exe -ArgumentList $Arguments -Wait + do { + start-sleep 10 + } until ((get-process "msiexec" -ea SilentlyContinue) -eq $Null) del c:\TEMP\SQLEXPR_x64_ENU.EXE Write-BuildLog "Creating Databases." Start-Process "C:\Program Files\Microsoft SQL Server\110\Tools\Binn\sqlcmd.exe" -ArgumentList "-S dc\SQLEXPRESS -i B:\Automate\DC\MakeDB.txt" -RedirectStandardOutput c:\sqllog.txt -Wait @@ -562,6 +573,9 @@ if (Test-Path "C:\Program Files\Microsoft SQL Server\100\Tools\Binn\sqlcmd.exe") copy B:\VIM_55\redist\SQLEXPR\SQLEXPR_x64_ENU.exe C:\temp $Arguments = '/IACCEPTSQLSERVERLICENSETERMS /action=Install /FEATURES=SQL,Tools /SQLSYSADMINACCOUNTS="Lab\Domain Admins" /SQLSVCACCOUNT="Lab\vi-admin" /SQLSVCPASSWORD="' + $AdminPWD + '" /AGTSVCACCOUNT="Lab\vi-admin" /AGTSVCPASSWORD="' + $AdminPWD + '" /ADDCURRENTUSERASSQLADMIN /SECURITYMODE=SQL /SAPWD="VMware1!" /INSTANCENAME=SQLExpress /BROWSERSVCSTARTUPTYPE="Automatic" /TCPENABLED=1 /NPENABLED=1 /SQLSVCSTARTUPTYPE=Automatic /q' Start-Process C:\temp\SQLEXPR_x64_ENU.exe -ArgumentList $Arguments -Wait + do { + start-sleep 10 + } until ((get-process "msiexec" -ea SilentlyContinue) -eq $Null) del c:\TEMP\SQLEXPR_x64_ENU.EXE Write-BuildLog "Creating Databases." Start-Process "C:\Program Files\Microsoft SQL Server\100\Tools\Binn\sqlcmd.exe" -ArgumentList "-S dc\SQLEXPRESS -i B:\Automate\DC\MakeDB.txt" -RedirectStandardOutput c:\sqllog.txt -Wait diff --git a/Build/Automate/NAS_Build.sh b/Build/Automate/NAS_Build.sh new file mode 100644 index 0000000..5237e28 --- /dev/null +++ b/Build/Automate/NAS_Build.sh @@ -0,0 +1,160 @@ +#!/bin/sh +mkdir /mnt/cd0 +mkdir /mnt/cd1 +mount /dev/sr0 /mnt/cd0 +mount /dev/sr1 /mnt/cd1 + +if [ -f "/mnt/LABVOL/Build/ESXi51/vmware-esx-base-readme" ] +then + echo "Already have ESXi 5.1 installer" +else + if grep -q "VMware ESXi 5.1" "/mnt/cd0/vmware-esx-base-osl.txt" + then + echo "Found ESXi 5.1 installer on CD0" + cp -r /mnt/cd0/* /mnt/LABVOL/Build/ESXi51 + fi + if grep -q "VMware ESXi 5.1" "/mnt/cd1/vmware-esx-base-osl.txt" + then + echo "Found ESXi 5.1 installer on CD1" + cp -r /mnt/cd1/* /mnt/LABVOL/Build/ESXi51 + fi +fi +if [ -f "/mnt/LABVOL/Build/ESXi55/vmware-esx-base-readme" ] +then + echo "Already have ESXi 5.5 installer" +else + if grep -q "VMware ESXi 5.5" "/mnt/cd0/vmware-esx-base-osl.txt" + then + echo "Found ESXi 5.5 installer on CD0" + cp -r /mnt/cd0/* /mnt/LABVOL/Build/ESXi55 + fi + if grep -q "VMware ESXi 5.5" "/mnt/cd1/vmware-esx-base-osl.txt" + then + echo "Found ESXi 5.5 installer on CD1" + cp -r /mnt/cd1/* /mnt/LABVOL/Build/ESXi55 + fi +fi +if [ -f "/mnt/LABVOL/Build/ESXi60/vmware-esx-base-readme" ] +then + echo "Already have ESXi 6.0 installer" +else + if grep -q "VMware ESXi 6.0" "/mnt/cd0/vmware-esx-base-osl.txt" + then + echo "Found ESXi 6.0 installer on CD0" + cp -r /mnt/cd0/* /mnt/LABVOL/Build/ESXi60 + fi + if grep -q "VMware ESXi 6.0" "/mnt/cd1/vmware-esx-base-osl.txt" + then + echo "Found ESXi 6.0 installer on CD1" + cp -r /mnt/cd1/* /mnt/LABVOL/Build/ESXi60 + fi +fi +if [ -f "/mnt/LABVOL/Build/ESXi65/vmware-esx-base-readme" ] +then + echo "Already have ESXi 6.5 installer" +else + if grep -q "6.5.0" "/mnt/cd0/vmware-esx-base-osl.txt" + then + echo "Found ESXi 6.5 installer on CD0" + cp -r /mnt/cd0/* /mnt/LABVOL/Build/ESXi65 + fi + if grep -q "6.5.0" "/mnt/cd1/vmware-esx-base-osl.txt" + then + echo "Found ESXi 6.5 installer on CD1" + cp -r /mnt/cd1/* /mnt/LABVOL/Build/ESXi65 + fi +fi +if [ -f "/mnt/LABVOL/Build/ESXi67/vmware-esx-base-readme" ] +then + echo "Already have ESXi 6.7 installer" +else + if grep -q "VMware ESXi 6.7" "/mnt/cd0/vmware-esx-base-osl.txt" + then + echo "Found ESXi 6.7 installer on CD0" + cp -r /mnt/cd0/* /mnt/LABVOL/Build/ESXi67 + fi + if grep -q "VMware ESXi 6.7" "/mnt/cd1/vmware-esx-base-osl.txt" + then + echo "Found ESXi 6.7 installer on CD1" + cp -r /mnt/cd1/* /mnt/LABVOL/Build/ESXi67 + fi +fi + +if [ -f "/mnt/LABVOL/Build/VIM_51/autorun.exe" ] +then + echo "Already have vCentre 5.1 installer" +else + if grep -q "VMWARE vCenter Server 5.1" "/mnt/cd0/readme.txt" + then + echo "Found vCentre 5.1 installer on CD0" + cp -r /mnt/cd0/* /mnt/LABVOL/Build/VIM_51 + fi + if grep -q "VMWARE vCenter Server 5.1" "/mnt/cd1/readme.txt" + then + echo "Found vCentre 5.1 installer on CD1" + cp -r /mnt/cd1/* /mnt/LABVOL/Build/VIM_51 + fi +fi +if [ -f "/mnt/LABVOL/Build/VIM_55/autorun.exe" ] +then + echo "Already have vCentre 5.5 installer" +else + if grep -q "VMWARE vCenter Server 5.5" "/mnt/cd0/readme.txt" + then + echo "Found vCentre 5.5 installer on CD0" + cp -r /mnt/cd0/* /mnt/LABVOL/Build/VIM_55 + fi + if grep -q "VMWARE vCenter Server 5.5" "/mnt/cd1/readme.txt" + then + echo "Found vCentre 5.5 installer on CD1" + cp -r /mnt/cd1/* /mnt/LABVOL/Build/VIM_55 + fi +fi +if [ -f "/mnt/LABVOL/Build/VIM_60/autorun.exe" ] +then + echo "Already have vCentre 6.0 installer" +else + if grep -q "VMWARE vCenter Server 6.0" "/mnt/cd0/readme.txt" + then + echo "Found vCentre 6.0 installer on CD0" + cp -r /mnt/cd0/* /mnt/LABVOL/Build/VIM_60 + fi + if grep -q "VMWARE vCenter Server 6.0" "/mnt/cd1/readme.txt" + then + echo "Found vCentre 6.0 installer on CD1" + cp -r /mnt/cd1/* /mnt/LABVOL/Build/VIM_60 + fi +fi + +if [ -f "/mnt/LABVOL/Build/VIM_65/autorun.exe" ] +then + echo "Already have vCentre 6.5 installer" +else + if grep -q "VMWARE vCenter Server 6.5" "/mnt/cd0/readme.txt" + then + echo "Found vCentre 6.5 installer on CD0" + cp -r /mnt/cd0/* /mnt/LABVOL/Build/VIM_65 + fi + if grep -q "VMWARE vCenter Server 6.5" "/mnt/cd1/readme.txt" + then + echo "Found vCentre 6.5 installer on CD1" + cp -r /mnt/cd1/* /mnt/LABVOL/Build/VIM_65 + fi +fi +if [ -f "/mnt/LABVOL/Build/VIM_67/autorun.exe" ] +then + echo "Already have vCentre 6.7 installer" +else + if grep -q "VMWARE vCenter Server 6.7" "/mnt/cd0/readme.txt" + then + echo "Found vCentre 6.7 installer on CD0" + cp -r /mnt/cd0/* /mnt/LABVOL/Build/VIM_67 + fi + if grep -q "VMWARE vCenter Server 6.7" "/mnt/cd1/readme.txt" + then + echo "Found vCentre 6.7 installer on CD1" + cp -r /mnt/cd1/* /mnt/LABVOL/Build/VIM_67 + fi +fi +umount -f /dev/sr0 +umount -f /dev/sr1 diff --git a/Build/Automate/automate.ini b/Build/Automate/automate.ini index ff4b14c..4dfe499 100644 --- a/Build/Automate/automate.ini +++ b/Build/Automate/automate.ini @@ -12,7 +12,7 @@ BuildVM=true ProductKey=XXXXX-XXXXX-XXXXX-XXXXX-XXXXX ViewInstall=None -ViewInstallOptions=50,51,52,53,60,70,None +ViewInstallOptions=50,51,52,53,60,70,75,None BuildViewVM=true ViewVMProductKey=XXXXX-XXXXX-XXXXX-XXXXX-XXXXX diff --git a/Build/Automate/popbuild.sh b/Build/Automate/popbuild.sh deleted file mode 100644 index 63cf8b1..0000000 --- a/Build/Automate/popbuild.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -mkdir /mnt/cd0 -mkdir /mnt/cd1 -mount /dev/sr0 /mnt/cd0 -mount /dev/sr1 /mnt/cd1 - -if [ -f "/mnt/LABVOL/Build/ESXi60/vmware-esx-base-readme" ] -then - echo "Already have ESXi 6.0 installer" -else - if [ -f "/mnt/cd0/vmware-esx-base-readme" ] - then - echo "Found ESXi installer on CD0" - cp -r /mnt/cd0/* /mnt/LABVOL/Build/ESXi60 - fi - if [ -f "/mnt/cd1/vmware-esx-base-readme" ] - then - echo "Found ESXi installer on CD1" - cp -r /mnt/cd1/* /mnt/LABVOL/Build/ESXi60 - fi -fi - -if [ -f "/mnt/LABVOL/Build/VIM_60/autorun.exe" ] -then - echo "Already have vCentre 6.0 installer" -else - if [ -f "/mnt/cd0/autorun.exe" ] - then - echo "Found vCentre installer on CD0" - cp -r /mnt/cd0/* /mnt/LABVOL/Build/VIM_60 - fi - if [ -f "/mnt/cd1/autorun.exe" ] - then - echo "Found vCentre installer on CD1" - cp -r /mnt/cd1/* /mnt/LABVOL/Build/VIM_60 - fi -fi -umount -f /dev/sr0 -umount -f /dev/sr1 - - diff --git a/SRC/NAS/freenas-FreeNAS-11.1-U5 (8e2a858a1)-20180624160211.db b/SRC/NAS/freenas-FreeNAS-11.1-U5 (8e2a858a1)-20180624160211.db new file mode 100644 index 0000000..008e3f1 Binary files /dev/null and b/SRC/NAS/freenas-FreeNAS-11.1-U5 (8e2a858a1)-20180624160211.db differ diff --git a/SRC/NAS/freenas-FreeNAS-9.10-STABLE-201606270534 (dd17351)-20160724115051.db b/SRC/NAS/freenas-FreeNAS-9.10-STABLE-201606270534 (dd17351)-20160724115051.db deleted file mode 100644 index 1b51735..0000000 Binary files a/SRC/NAS/freenas-FreeNAS-9.10-STABLE-201606270534 (dd17351)-20160724115051.db and /dev/null differ