6dcf96e40a
Pairs with Phase 1+2 from earlier (alias maps in Install-FromManifest,
GE-Enforce, Get-PCProfile, verify-state). See project-shopfloor-rename-reorg
memory for the plan.
Phase 3 (repo + paths):
- git mv per-PC-type dirs to gea-shopfloor-* names:
Standard -> gea-shopfloor-collections
CMM -> gea-shopfloor-cmm
Keyence -> gea-shopfloor-keyence
Genspect -> gea-shopfloor-genspect
WaxAndTrace -> gea-shopfloor-waxtrace
Display -> gea-shopfloor-display
Lab -> gea-shopfloor-common (folded; Timeclock+Lab merge)
- New gea-shopfloor-nocollections/ (clone of collections sans UDC scripts).
- New gea-shopfloor-heattreat/ (placeholder, README only).
- Move Standard/ntlars-backups/ -> _ntlars-backups/ (per-MN, not per-type).
- Run-ShopfloorSetup.ps1: Resolve-PCTypeDir helper walks alias group when
the on-disk dir for the current pcType is missing. Set-MachineNumber
helper-copy gated on collections|nocollections|legacy Standard-Machine.
- Update-MachineNumber.ps1: pcProfiles lookups try gea-shopfloor-collections
first, fall back to legacy Standard-Machine. PowerShell 5.1 compatible
(no null-coalesce).
Phase 4 (startnet.cmd menu):
- Choice 3 "GEA Shopfloor" now drills into a 9-item sub-menu instead of
going straight to enrollment. Sub-cats:
1. Machine with Collections -> gea-shopfloor-collections
2. Machine without Collections -> gea-shopfloor-nocollections
3. Common (Timeclock, Lab) -> gea-shopfloor-common
4. Keyence -> gea-shopfloor-keyence
5. CMM -> gea-shopfloor-cmm
6. Genspect -> gea-shopfloor-genspect
7. Heattreat -> gea-shopfloor-heattreat
8. Wax and Trace -> gea-shopfloor-waxtrace
9. Display -> gea-shopfloor-display
- Office menu (existing 6-option) follows for every sub-cat.
- Machine number prompt only for collections + nocollections.
- pc-subtype.txt + display-type.txt no longer written. PCTYPE is a
single full string (gea-shopfloor-*); subtype-aware code paths fall
back to empty and resolve via the alias map.
- CMM bootstrap stage gate switched from "%PCTYPE%"=="CMM" to
"%PCTYPE%"=="gea-shopfloor-cmm".
Test harness:
- B-enforce/run.sh PCSUBTYPE default changed from "Machine" to "" so
single-arg invocation matches the new single-string scheme. Two-arg
legacy form ("Standard Machine") still works via aliasing.
- B-enforce/tamper.ps1 alias-aware Test-MatrixEntryMatches mirroring
verify-state.ps1.
Smoke-tested on win11 VM as SYSTEM via qga: B-enforce harness 5-phase
cycle (stage / baseline / tamper / heal / idempotent) passes 10/10
with PCType=gea-shopfloor-collections AND with legacy "Standard Machine"
two-arg form.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
87 lines
3.6 KiB
PowerShell
87 lines
3.6 KiB
PowerShell
# 03-RestoreEDncConfig.ps1 - Restore per-machine eDNC config from .reg backup.
|
|
#
|
|
# Runs at shopfloor-setup time AFTER 01-eDNC.ps1 has installed eDNC. If the
|
|
# tech typed a real machine number at the PXE menu (not left blank -> 9999),
|
|
# look for a .reg backup matching that number on the PXE-local copy of the
|
|
# setup tree and import it. That restores everything eDNC-side the backup
|
|
# captured: eFocas IP/port, PPDCS serial (baud/parity/bits), Hssb KRelay1,
|
|
# etc. - instead of the reimaged PC coming up on factory defaults.
|
|
#
|
|
# After reg import, the tech-typed machine number is written to HKLM and to
|
|
# UDC's settings JSON to guarantee the current number wins over whatever the
|
|
# backup happened to contain (off-by-one backups exist in the historical
|
|
# dump; see ntlars-fixed/ work on the PXE host).
|
|
#
|
|
# Skipped when:
|
|
# - pc-subtype != Machine (Timeclock PCs do not use a machine number)
|
|
# - machine-number.txt missing / empty / 9999 (tech declined to set one)
|
|
# - ntlars-backups/ folder missing from the staged setup tree
|
|
# - no matching .reg file on disk for this machine number
|
|
|
|
$ErrorActionPreference = 'Continue'
|
|
|
|
$logDir = 'C:\Logs\SFLD'
|
|
if (-not (Test-Path $logDir)) { try { New-Item -ItemType Directory -Path $logDir -Force | Out-Null } catch {} }
|
|
try { Start-Transcript -Path (Join-Path $logDir '03-RestoreEDncConfig.log') -Append -Force | Out-Null } catch {}
|
|
|
|
Write-Host "=== Restore eDNC config from backup ==="
|
|
|
|
# ---- Sub-type gate ----
|
|
$subtypeFile = 'C:\Enrollment\pc-subtype.txt'
|
|
if (Test-Path $subtypeFile) {
|
|
$subtype = (Get-Content $subtypeFile -First 1 -ErrorAction SilentlyContinue).Trim()
|
|
if ($subtype -eq 'Timeclock') {
|
|
Write-Host "Standard-Timeclock - skipping."
|
|
try { Stop-Transcript | Out-Null } catch {}
|
|
return
|
|
}
|
|
}
|
|
|
|
# ---- Read machine number captured at PXE time ----
|
|
$mnFile = 'C:\Enrollment\machine-number.txt'
|
|
if (-not (Test-Path $mnFile)) {
|
|
Write-Host "machine-number.txt not present - skipping (tech did not set one)."
|
|
try { Stop-Transcript | Out-Null } catch {}
|
|
return
|
|
}
|
|
$machineNum = (Get-Content $mnFile -First 1 -ErrorAction SilentlyContinue).Trim()
|
|
if (-not $machineNum -or $machineNum -eq '9999') {
|
|
Write-Host "Machine number is '$machineNum' (placeholder or empty) - skipping."
|
|
try { Stop-Transcript | Out-Null } catch {}
|
|
return
|
|
}
|
|
|
|
Write-Host "Machine number: $machineNum"
|
|
|
|
# ---- Locate local backup root (staged from PXE during imaging) ----
|
|
$backupRoot = 'C:\Enrollment\shopfloor-setup\Standard\ntlars-backups'
|
|
if (-not (Test-Path $backupRoot)) {
|
|
Write-Host "ntlars-backups folder not staged at $backupRoot - skipping."
|
|
try { Stop-Transcript | Out-Null } catch {}
|
|
return
|
|
}
|
|
|
|
. "$PSScriptRoot\..\Shopfloor\lib\Restore-EDncReg.ps1"
|
|
$imported = Import-EDncRegBackup -SourceRoot $backupRoot -MachineNumber $machineNum
|
|
|
|
if (-not $imported) {
|
|
Write-Host "No backup imported - leaving eDNC at installer defaults."
|
|
try { Stop-Transcript | Out-Null } catch {}
|
|
return
|
|
}
|
|
|
|
# ---- Tech-typed number wins: overwrite MachineNo in both eDNC and UDC. ----
|
|
# The imported .reg probably already has the right number (we rewrote the
|
|
# historical dump) but off-by-one backups exist, and this is cheap insurance.
|
|
. "$PSScriptRoot\..\Shopfloor\lib\Update-MachineNumber.ps1"
|
|
|
|
$current = Get-CurrentMachineNumber
|
|
Write-Host "Post-import state: UDC='$($current.Udc)' eDNC='$($current.Ednc)'"
|
|
|
|
$result = Update-MachineNumber -NewNumber $machineNum
|
|
if ($result.UdcUpdated) { Write-Host " UDC MachineNumber set to $machineNum" }
|
|
if ($result.EdncUpdated) { Write-Host " eDNC MachineNo set to $machineNum" }
|
|
foreach ($err in $result.Errors) { Write-Warning " $err" }
|
|
|
|
try { Stop-Transcript | Out-Null } catch {}
|