From eefb24fe5bed8233b26b444785d6199c4c3ba06f Mon Sep 17 00:00:00 2001 From: "markus.richter" Date: Fri, 10 Nov 2017 15:12:14 +0100 Subject: [PATCH] Removed oracle.cert --- scripts/vm-guest-tools.bat | 4 ---- windows_10.json | 6 ++---- windows_2008_r2.json | 6 ++---- windows_2008_r2_core.json | 6 ++---- windows_2012.json | 6 ++---- windows_2012_r2.json | 6 ++---- windows_2012_r2_core.json | 6 ++---- windows_2012_r2_hyperv.json | 6 ++---- windows_2016.json | 6 ++---- windows_7.json | 6 ++---- windows_81.json | 6 ++---- 11 files changed, 20 insertions(+), 44 deletions(-) diff --git a/scripts/vm-guest-tools.bat b/scripts/vm-guest-tools.bat index 6d6e467c..7c0e391c 100644 --- a/scripts/vm-guest-tools.bat +++ b/scripts/vm-guest-tools.bat @@ -28,10 +28,6 @@ goto :done :virtualbox -:: There needs to be Oracle CA (Certificate Authority) certificates installed in order -:: to prevent user intervention popups which will undermine a silent installation. -cmd /c certutil -addstore -f "TrustedPublisher" A:\oracle-cert.cer - move /Y C:\Users\vagrant\VBoxGuestAdditions.iso C:\Windows\Temp cmd /c ""C:\Program Files\7-Zip\7z.exe" x C:\Windows\Temp\VBoxGuestAdditions.iso -oC:\Windows\Temp\virtualbox" cmd /c for %%i in (C:\Windows\Temp\virtualbox\cert\vbox*.cer) do C:\Windows\Temp\virtualbox\cert\VBoxCertUtil add-trusted-publisher %%i --root %%i diff --git a/windows_10.json b/windows_10.json index 227f0c66..1eadecac 100644 --- a/windows_10.json +++ b/windows_10.json @@ -49,8 +49,7 @@ "./scripts/fixnetwork.ps1", "./scripts/microsoft-updates.bat", "./scripts/win-updates.ps1", - "./scripts/openssh.ps1", - "./scripts/oracle-cert.cer" + "./scripts/openssh.ps1" ], "vboxmanage": [ [ @@ -85,8 +84,7 @@ "./scripts/fixnetwork.ps1", "./scripts/microsoft-updates.bat", "./scripts/win-updates.ps1", - "./scripts/openssh.ps1", - "./scripts/oracle-cert.cer" + "./scripts/openssh.ps1" ], "prlctl": [ [ diff --git a/windows_2008_r2.json b/windows_2008_r2.json index 054e03fb..1cf3f0ef 100644 --- a/windows_2008_r2.json +++ b/windows_2008_r2.json @@ -47,8 +47,7 @@ "{{user `autounattend`}}", "./scripts/microsoft-updates.bat", "./scripts/win-updates.ps1", - "./scripts/openssh.ps1", - "./scripts/oracle-cert.cer" + "./scripts/openssh.ps1" ], "vboxmanage": [ [ @@ -82,8 +81,7 @@ "{{user `autounattend`}}", "./scripts/microsoft-updates.bat", "./scripts/win-updates.ps1", - "./scripts/openssh.ps1", - "./scripts/oracle-cert.cer" + "./scripts/openssh.ps1" ], "prlctl": [ [ diff --git a/windows_2008_r2_core.json b/windows_2008_r2_core.json index 124562fd..23d4b8d4 100644 --- a/windows_2008_r2_core.json +++ b/windows_2008_r2_core.json @@ -47,8 +47,7 @@ "{{user `autounattend`}}", "./scripts/microsoft-updates.bat", "./scripts/win-updates.ps1", - "./scripts/openssh.ps1", - "./scripts/oracle-cert.cer" + "./scripts/openssh.ps1" ], "vboxmanage": [ [ @@ -82,8 +81,7 @@ "{{user `autounattend`}}", "./scripts/microsoft-updates.bat", "./scripts/win-updates.ps1", - "./scripts/openssh.ps1", - "./scripts/oracle-cert.cer" + "./scripts/openssh.ps1" ], "prlctl": [ [ diff --git a/windows_2012.json b/windows_2012.json index c243d69b..6b9215c2 100644 --- a/windows_2012.json +++ b/windows_2012.json @@ -47,8 +47,7 @@ "{{user `autounattend`}}", "./scripts/microsoft-updates.bat", "./scripts/win-updates.ps1", - "./scripts/openssh.ps1", - "./scripts/oracle-cert.cer" + "./scripts/openssh.ps1" ], "vboxmanage": [ [ @@ -82,8 +81,7 @@ "{{user `autounattend`}}", "./scripts/microsoft-updates.bat", "./scripts/win-updates.ps1", - "./scripts/openssh.ps1", - "./scripts/oracle-cert.cer" + "./scripts/openssh.ps1" ], "prlctl": [ [ diff --git a/windows_2012_r2.json b/windows_2012_r2.json index a2faab87..e0f87ec7 100644 --- a/windows_2012_r2.json +++ b/windows_2012_r2.json @@ -47,8 +47,7 @@ "{{user `autounattend`}}", "./scripts/microsoft-updates.bat", "./scripts/win-updates.ps1", - "./scripts/openssh.ps1", - "./scripts/oracle-cert.cer" + "./scripts/openssh.ps1" ], "vboxmanage": [ [ @@ -82,8 +81,7 @@ "{{user `autounattend`}}", "./scripts/microsoft-updates.bat", "./scripts/win-updates.ps1", - "./scripts/openssh.ps1", - "./scripts/oracle-cert.cer" + "./scripts/openssh.ps1" ], "prlctl": [ [ diff --git a/windows_2012_r2_core.json b/windows_2012_r2_core.json index e277402f..b63227a1 100644 --- a/windows_2012_r2_core.json +++ b/windows_2012_r2_core.json @@ -47,8 +47,7 @@ "{{user `autounattend`}}", "./scripts/microsoft-updates.bat", "./scripts/win-updates.ps1", - "./scripts/openssh.ps1", - "./scripts/oracle-cert.cer" + "./scripts/openssh.ps1" ], "vboxmanage": [ [ @@ -82,8 +81,7 @@ "{{user `autounattend`}}", "./scripts/microsoft-updates.bat", "./scripts/win-updates.ps1", - "./scripts/openssh.ps1", - "./scripts/oracle-cert.cer" + "./scripts/openssh.ps1" ], "prlctl": [ [ diff --git a/windows_2012_r2_hyperv.json b/windows_2012_r2_hyperv.json index 2ac39f5d..fddda4c2 100644 --- a/windows_2012_r2_hyperv.json +++ b/windows_2012_r2_hyperv.json @@ -47,8 +47,7 @@ "{{user `autounattend`}}", "./scripts/microsoft-updates.bat", "./scripts/win-updates.ps1", - "./scripts/openssh.ps1", - "./scripts/oracle-cert.cer" + "./scripts/openssh.ps1" ], "vboxmanage": [ [ @@ -82,8 +81,7 @@ "{{user `autounattend`}}", "./scripts/microsoft-updates.bat", "./scripts/win-updates.ps1", - "./scripts/openssh.ps1", - "./scripts/oracle-cert.cer" + "./scripts/openssh.ps1" ], "prlctl": [ [ diff --git a/windows_2016.json b/windows_2016.json index 672c28c9..5eaba96f 100644 --- a/windows_2016.json +++ b/windows_2016.json @@ -47,8 +47,7 @@ "{{user `autounattend`}}", "./scripts/microsoft-updates.bat", "./scripts/win-updates.ps1", - "./scripts/openssh.ps1", - "./scripts/oracle-cert.cer" + "./scripts/openssh.ps1" ], "vboxmanage": [ [ @@ -82,8 +81,7 @@ "{{user `autounattend`}}", "./scripts/microsoft-updates.bat", "./scripts/win-updates.ps1", - "./scripts/openssh.ps1", - "./scripts/oracle-cert.cer" + "./scripts/openssh.ps1" ], "prlctl": [ [ diff --git a/windows_7.json b/windows_7.json index 505d3db9..e1b99c7f 100644 --- a/windows_7.json +++ b/windows_7.json @@ -51,8 +51,7 @@ "./scripts/hotfix-KB3102810.bat", "./scripts/microsoft-updates.bat", "./scripts/win-updates.ps1", - "./scripts/openssh.ps1", - "./scripts/oracle-cert.cer" + "./scripts/openssh.ps1" ], "vboxmanage": [ [ @@ -87,8 +86,7 @@ "./scripts/dis-updates.ps1", "./scripts/microsoft-updates.bat", "./scripts/win-updates.ps1", - "./scripts/openssh.ps1", - "./scripts/oracle-cert.cer" + "./scripts/openssh.ps1" ], "prlctl": [ [ diff --git a/windows_81.json b/windows_81.json index ce69325b..a4b72444 100644 --- a/windows_81.json +++ b/windows_81.json @@ -47,8 +47,7 @@ "{{user `autounattend`}}", "./scripts/microsoft-updates.bat", "./scripts/win-updates.ps1", - "./scripts/openssh.ps1", - "./scripts/oracle-cert.cer" + "./scripts/openssh.ps1" ], "vboxmanage": [ [ @@ -82,8 +81,7 @@ "{{user `autounattend`}}", "./scripts/microsoft-updates.bat", "./scripts/win-updates.ps1", - "./scripts/openssh.ps1", - "./scripts/oracle-cert.cer" + "./scripts/openssh.ps1" ], "prlctl": [ [