wip

microsoft · Mar 12, 2024 · f950fde · f950fde
1 parent b4edf2a
commit f950fde
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/scripts/check_msi_installation.ps1 b/scripts/check_msi_installation.ps1
@@ -75,10 +75,9 @@ function Install-MsiPackage {
 
     $res = $true
 
-    $arguments = "/i $MsiPath /qn /norestart /log msi-install.log $MsiAdditionalArguments"
+    $arguments = "/i $MsiPath /qn /norestart /l*vx /log msi-install.log $MsiAdditionalArguments"
     Write-Host "Installing MSI package with arguments: '$arguments'..."
     $process = Start-Process -FilePath msiexec.exe -ArgumentList $arguments -Wait -PassThru
-
     if ($process.ExitCode -eq 0) {
         Write-Host "Installation successful!"
     } else {

diff --git a/scripts/config_test_vm.psm1 b/scripts/config_test_vm.psm1
@@ -230,7 +230,6 @@ function Install-eBPFComponentsOnVM
               [Parameter(Mandatory=$true)] [bool] $KmTracing,
               [Parameter(Mandatory=$true)] [string] $KmTraceType)
         $WorkingDirectory = "$env:SystemDrive\$WorkingDirectory"
-        Write-Host "Working Directory: $WorkingDirectory"
         Import-Module $WorkingDirectory\common.psm1 -ArgumentList ($LogFileName) -Force -WarningAction SilentlyContinue
         Import-Module $WorkingDirectory\install_ebpf.psm1 -ArgumentList ($WorkingDirectory, $LogFileName) -Force -WarningAction SilentlyContinue
 

diff --git a/scripts/install_ebpf.psm1 b/scripts/install_ebpf.psm1
@@ -5,7 +5,6 @@ param ([Parameter(Mandatory=$True)] [string] $WorkingDirectory,
        [Parameter(Mandatory=$True)] [string] $LogFileName)
 
 Push-Location $WorkingDirectory
-Write-Host "install_ebpf - Working Directory: $WorkingDirectory"
 Import-Module $PSScriptRoot\common.psm1 -Force -ArgumentList ($LogFileName) -WarningAction SilentlyContinue
 
 $VcRedistPath = Join-Path $WorkingDirectory "vc_redist.x64.exe"
@@ -95,36 +94,28 @@ function Install-eBPFComponents
           [parameter(Mandatory=$true)] [string] $KmTraceType,
           [parameter(Mandatory=$false)] [bool] $KMDFVerifier = $false)
 
-    $CurrentDirectory = $PWD
-    Write-Host "Current directory: $CurrentDirectory"
-    Get-ChildItem -Path $PWD -File
-
     # Install the Visual C++ Redistributable.
     try {
         Write-Host "Installing Visual C++ Redistributable from '$VcRedistPath'..."
         $process = Start-Process -FilePath $VcRedistPath -ArgumentList "/quiet", "/norestart" -Wait -PassThru
-        if ($process.ExitCode -eq 0) {
-            Write-Host "Visual C++ Redistributable installation completed successfully."
-        } else {
-            Write-Host "Visual C++ Redistributable installation failed. Exit code: $($process.ExitCode)"
+        if ($process.ExitCode -ne 0) {
+            Write-Host "Visual C++ Redistributable installation FAILED. Exit code: $($process.ExitCode)"
             exit 1
         }
         Write-Host "Cleaning up..."
         Remove-Item $VcRedistPath -Force
-        Write-Host "Visual C++ Redistributable installation completed."
+        Write-Host "Visual C++ Redistributable installation completed successfully!"
     } catch {
         Write-Host "An exception occurred while installing Visual C++ Redistributable: $_"
         exit 1
     }
 
     # Install the MSI package.
     try {
-        $arguments = "/i `"$MsiPath`" INSTALLFOLDER=`"$MsiInstallPath`" ADDLOCAL=ALL /qn /norestart /l*vx /log msi-install.log"
-        Write-Host "Installing MSI package with arguments: '$arguments'..."
+        $arguments = "/i $MsiPath /qn /norestart /l*vx /log msi-install.log ADDLOCAL=ADDLOCAL=eBPF_Runtime_Components,eBPF_Runtime_Components_JIT"
+        Write-Host "Installing the eBPF MSI package with arguments: '$arguments'..."
         $process = Start-Process -FilePath msiexec.exe -ArgumentList $arguments -Wait -PassThru
-        if ($process.ExitCode -eq 0) {
-            Write-Host "Installation successful!"
-        } else {
+        if ($process.ExitCode -ne 0) {
             Write-Host "MSI installation FAILED. Exit code: $($process.ExitCode)"
             $logContents = Get-Content -Path "msi-install.log" -ErrorAction SilentlyContinue
             if ($logContents) {
@@ -135,6 +126,7 @@ function Install-eBPFComponents
             }
             exit 1;
         }
+        Write-Host "eBPF MSI installation completed successfully!"
     } catch {
         Write-Host "An error occurred while installing the MSI package: $_"
         exit 1;