Drop NicType.NONE from this PR

The NONE option introduced earlier in this branch is being removed per
review feedback (#4408). Whether to add explicit "None" options across
multiple menus (greeter, gfx driver, network, bootloader) is now being
discussed in #4464 and should land as a separate change there.

This PR keeps only the warning-on-confirm behaviour: when the user
skipped the network menu entirely (network_config is None), a yellow
warning is shown on the final confirmation screen.
This commit is contained in:
Softer 2026-04-28 12:47:39 +03:00
parent 73052558db
commit 7bebf05b04
4 changed files with 1 additions and 8 deletions

View File

@ -12,7 +12,6 @@ class NicType(Enum):
NM = 'nm'
NM_IWD = 'nm_iwd'
MANUAL = 'manual'
NONE = 'none'
def display_msg(self) -> str:
match self:
@ -24,8 +23,6 @@ class NicType(Enum):
return tr('Use Network Manager (iwd backend)')
case NicType.MANUAL:
return tr('Manual configuration')
case NicType.NONE:
return tr('No network configuration')
class _NicSerialization(TypedDict):

View File

@ -37,8 +37,6 @@ def install_network_config(
installation.configure_nic(nic)
installation.enable_service('systemd-networkd')
installation.enable_service('systemd-resolved')
case NicType.NONE:
pass
def _configure_nm_iwd(installation: Installer) -> None:

View File

@ -208,7 +208,5 @@ async def select_network(preset: NetworkConfiguration | None) -> NetworkConfigur
if nics:
return NetworkConfiguration(NicType.MANUAL, nics)
case NicType.NONE:
return NetworkConfiguration(NicType.NONE)
return preset

View File

@ -486,7 +486,7 @@ msgid "Define users with sudo privilege: "
msgstr "Визначте користувачів із привілеєм sudo: "
msgid "No network configuration"
msgstr "Без налаштування мережі"
msgstr "Відсутня конфігурація мережі"
msgid "Set desired subvolumes on a btrfs partition"
msgstr "Встановіть потрібні підтома на розділі btrfs"