diff --git a/playbook/pxe_server_setup.yml b/playbook/pxe_server_setup.yml index c9109b9..a9351f0 100644 --- a/playbook/pxe_server_setup.yml +++ b/playbook/pxe_server_setup.yml @@ -38,10 +38,6 @@ - gea-standard - gea-engineer - gea-shopfloor - - ge-standard - - ge-engineer - - ge-shopfloor-lockdown - - ge-shopfloor-mce shopfloor_types: - gea-shopfloor # Image variants that share the generic Win10/Win11 unattend @@ -50,8 +46,6 @@ standard_types: - gea-standard - gea-engineer - - ge-standard - - ge-engineer deploy_subdirs: - Applications - Control diff --git a/playbook/startnet.cmd b/playbook/startnet.cmd index 752cfec..abbf6ca 100644 --- a/playbook/startnet.cmd +++ b/playbook/startnet.cmd @@ -38,14 +38,10 @@ echo. echo 1. GEA Standard echo 2. GEA Engineer echo 3. GEA Shopfloor (sub-menu) -echo 4. GE Standard -echo 5. GE Engineer -echo 6. GE Shopfloor Lockdown -echo 7. GE Shopfloor MCE echo. echo ======================================== echo. -set /p choice=Enter your choice (1-7): +set /p choice=Enter your choice (1-3): REM --- Shopfloor images (3,6,7) need GCCH enrollment + (for 3) PC-type sub-menu. REM Choice 3 = GEA Shopfloor: drill into sub-menu first to pick the gea-shopfloor-* @@ -270,10 +266,6 @@ echo. > X:\Boot.tag if "%choice%"=="1" goto gea-standard if "%choice%"=="2" goto gea-engineer if "%choice%"=="3" goto gea-shopfloor -if "%choice%"=="4" goto ge-standard -if "%choice%"=="5" goto ge-engineer -if "%choice%"=="6" goto ge-shopfloor-lockdown -if "%choice%"=="7" goto ge-shopfloor-mce echo Invalid choice. Please try again. pause goto menu @@ -302,38 +294,6 @@ for /l %%i in (1,1,2000000) do rem net use Z: \\172.16.9.1\winpeapps\gea-shopfloor /user:pxe-upload pxe /persistent:no goto end -:ge-standard -echo. -echo Starting GE Standard setup... -start "FlatApp" %SYSTEMDRIVE%\GESetup\FlatSetupLoader.exe -for /l %%i in (1,1,2000000) do rem -net use Z: \\172.16.9.1\winpeapps\ge-standard /user:pxe-upload pxe /persistent:no -goto end - -:ge-engineer -echo. -echo Starting GE Engineer setup... -start "FlatApp" %SYSTEMDRIVE%\GESetup\FlatSetupLoader.exe -for /l %%i in (1,1,2000000) do rem -net use Z: \\172.16.9.1\winpeapps\ge-engineer /user:pxe-upload pxe /persistent:no -goto end - -:ge-shopfloor-lockdown -echo. -echo Starting GE Shopfloor Lockdown setup... -start "FlatApp" %SYSTEMDRIVE%\GESetup\FlatSetupLoader.exe -for /l %%i in (1,1,2000000) do rem -net use Z: \\172.16.9.1\winpeapps\ge-shopfloor-lockdown /user:pxe-upload pxe /persistent:no -goto end - -:ge-shopfloor-mce -echo. -echo Starting GE Shopfloor MCE setup... -start "FlatApp" %SYSTEMDRIVE%\GESetup\FlatSetupLoader.exe -for /l %%i in (1,1,2000000) do rem -net use Z: \\172.16.9.1\winpeapps\ge-shopfloor-mce /user:pxe-upload pxe /persistent:no -goto end - :end echo. diff --git a/startnet-template.cmd b/startnet-template.cmd index a238ecf..13faa8c 100644 --- a/startnet-template.cmd +++ b/startnet-template.cmd @@ -38,14 +38,10 @@ echo. echo 1. GEA Standard echo 2. GEA Engineer echo 3. GEA Shopfloor -echo 4. GE Standard -echo 5. GE Engineer -echo 6. GE Shopfloor Lockdown -echo 7. GE Shopfloor MCE echo. echo ======================================== echo. -set /p choice=Enter your choice (1-7): +set /p choice=Enter your choice (1-3): REM --- Only shopfloor images (3,6,7) need GCCH enrollment --- set PPKG= @@ -186,10 +182,6 @@ echo. > X:\Boot.tag if "%choice%"=="1" goto gea-standard if "%choice%"=="2" goto gea-engineer if "%choice%"=="3" goto gea-shopfloor -if "%choice%"=="4" goto ge-standard -if "%choice%"=="5" goto ge-engineer -if "%choice%"=="6" goto ge-shopfloor-lockdown -if "%choice%"=="7" goto ge-shopfloor-mce echo Invalid choice. Please try again. pause goto menu @@ -218,38 +210,6 @@ for /l %%i in (1,1,2000000) do rem net use Z: \\172.16.9.1\winpeapps\gea-shopfloor /user:pxe-upload pxe /persistent:no goto end -:ge-standard -echo. -echo Starting GE Standard setup... -start "FlatApp" %SYSTEMDRIVE%\GESetup\FlatSetupLoader.exe -for /l %%i in (1,1,2000000) do rem -net use Z: \\172.16.9.1\winpeapps\ge-standard /user:pxe-upload pxe /persistent:no -goto end - -:ge-engineer -echo. -echo Starting GE Engineer setup... -start "FlatApp" %SYSTEMDRIVE%\GESetup\FlatSetupLoader.exe -for /l %%i in (1,1,2000000) do rem -net use Z: \\172.16.9.1\winpeapps\ge-engineer /user:pxe-upload pxe /persistent:no -goto end - -:ge-shopfloor-lockdown -echo. -echo Starting GE Shopfloor Lockdown setup... -start "FlatApp" %SYSTEMDRIVE%\GESetup\FlatSetupLoader.exe -for /l %%i in (1,1,2000000) do rem -net use Z: \\172.16.9.1\winpeapps\ge-shopfloor-lockdown /user:pxe-upload pxe /persistent:no -goto end - -:ge-shopfloor-mce -echo. -echo Starting GE Shopfloor MCE setup... -start "FlatApp" %SYSTEMDRIVE%\GESetup\FlatSetupLoader.exe -for /l %%i in (1,1,2000000) do rem -net use Z: \\172.16.9.1\winpeapps\ge-shopfloor-mce /user:pxe-upload pxe /persistent:no -goto end - :end echo. echo Waiting for PESetup.exe to start... diff --git a/webapp/config.py b/webapp/config.py index c6328f3..2016f74 100644 --- a/webapp/config.py +++ b/webapp/config.py @@ -56,20 +56,12 @@ IMAGE_TYPES = [ "gea-standard", "gea-engineer", "gea-shopfloor", - "ge-standard", - "ge-engineer", - "ge-shopfloor-lockdown", - "ge-shopfloor-mce", ] FRIENDLY_NAMES = { "gea-standard": "GE Aerospace Standard", "gea-engineer": "GE Aerospace Engineer", "gea-shopfloor": "GE Aerospace Shop Floor", - "ge-standard": "GE Legacy Standard", - "ge-engineer": "GE Legacy Engineer", - "ge-shopfloor-lockdown": "GE Legacy Shop Floor Lockdown", - "ge-shopfloor-mce": "GE Legacy Shop Floor MCE", } # --- Unattend XML namespaces -------------------------------------------------