Deploy: Npcap is a one-time MANUAL install per cockpit (operator consensus)
Retire the bundled-silent-installer requirement: postinstall now detects an existing Npcap service and moves on, warns clearly when absent, and still honors a bundled deploy\npcap.exe if one is shipped. package.ps1 no longer flags the missing bundle as a warning. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -78,9 +78,10 @@ if ($NoContent) {
|
||||
if ($Renderer) { Copy-Item $Renderer (Join-Path $root 'renderer.exe'); Log "bundled renderer -> renderer.exe" }
|
||||
else { Warn "no -Renderer: renderer NOT bundled (freeze pending). pod-launch needs --renderer or a bundled render-bridge at runtime." }
|
||||
|
||||
# Npcap installer -- else flagged
|
||||
# Npcap installer -- optional: policy (2026-07-10) is a one-time MANUAL install
|
||||
# per cockpit; postinstall detects it and only warns when absent.
|
||||
if ($Npcap) { Copy-Item $Npcap (Join-Path $root 'deploy\npcap.exe'); Log "bundled Npcap -> deploy\npcap.exe" }
|
||||
else { Warn "no -Npcap: installer NOT bundled. postinstall will warn + the pcap bridge won't work until Npcap is present." }
|
||||
else { Log "Npcap not bundled (manual-install policy; operator installs once per cockpit)" }
|
||||
|
||||
if ($VcRedist) { Copy-Item $VcRedist (Join-Path $root 'deploy\vc_redist.x64.exe'); Log "bundled VC++ runtime" }
|
||||
|
||||
|
||||
@@ -19,15 +19,21 @@ if not defined ROOT (
|
||||
)
|
||||
echo [postinstall] ROOT=!ROOT!
|
||||
|
||||
REM --- 1. Npcap silent install (bundled OEM-class installer supporting /S) --
|
||||
REM --- 1. Npcap: POLICY (operator consensus 2026-07-10) = installed MANUALLY
|
||||
REM once per cockpit. Detect an existing install; a bundled
|
||||
REM deploy\npcap.exe is still honored if someone ships one.
|
||||
set "NPCAP=!ROOT!\deploy\npcap.exe"
|
||||
if exist "!NPCAP!" (
|
||||
echo [postinstall] installing Npcap silently...
|
||||
sc query npcap >nul 2>&1
|
||||
if not errorlevel 1 (
|
||||
echo [postinstall] Npcap already installed -- OK
|
||||
) else if exist "!NPCAP!" (
|
||||
echo [postinstall] installing bundled Npcap silently...
|
||||
"!NPCAP!" /S
|
||||
if errorlevel 1 ( echo [postinstall] ERROR: Npcap install failed & exit /b 1 )
|
||||
) else (
|
||||
echo [postinstall] WARNING: bundled Npcap not found at "!NPCAP!"
|
||||
echo [postinstall] the pcap bridge will not work without it
|
||||
echo [postinstall] WARNING: Npcap is NOT installed on this machine.
|
||||
echo [postinstall] Run the Npcap installer manually ^(default options^),
|
||||
echo [postinstall] then launch normally -- the pod's NIC bridge needs it.
|
||||
)
|
||||
|
||||
REM --- optional: bundled VC++ runtime, if present --------------------------
|
||||
|
||||
Reference in New Issue
Block a user