Skip to content

Commit 7bebf05

Browse files
committed
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.
1 parent 7305255 commit 7bebf05

4 files changed

Lines changed: 1 addition & 8 deletions

File tree

archinstall/lib/models/network.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ class NicType(Enum):
1212
NM = 'nm'
1313
NM_IWD = 'nm_iwd'
1414
MANUAL = 'manual'
15-
NONE = 'none'
1615

1716
def display_msg(self) -> str:
1817
match self:
@@ -24,8 +23,6 @@ def display_msg(self) -> str:
2423
return tr('Use Network Manager (iwd backend)')
2524
case NicType.MANUAL:
2625
return tr('Manual configuration')
27-
case NicType.NONE:
28-
return tr('No network configuration')
2926

3027

3128
class _NicSerialization(TypedDict):

archinstall/lib/network/network_handler.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ def install_network_config(
3737
installation.configure_nic(nic)
3838
installation.enable_service('systemd-networkd')
3939
installation.enable_service('systemd-resolved')
40-
case NicType.NONE:
41-
pass
4240

4341

4442
def _configure_nm_iwd(installation: Installer) -> None:

archinstall/lib/network/network_menu.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,5 @@ async def select_network(preset: NetworkConfiguration | None) -> NetworkConfigur
208208

209209
if nics:
210210
return NetworkConfiguration(NicType.MANUAL, nics)
211-
case NicType.NONE:
212-
return NetworkConfiguration(NicType.NONE)
213211

214212
return preset

archinstall/locales/uk/LC_MESSAGES/base.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ msgid "Define users with sudo privilege: "
486486
msgstr "Визначте користувачів із привілеєм sudo: "
487487

488488
msgid "No network configuration"
489-
msgstr "Без налаштування мережі"
489+
msgstr "Відсутня конфігурація мережі"
490490

491491
msgid "Set desired subvolumes on a btrfs partition"
492492
msgstr "Встановіть потрібні підтома на розділі btrfs"

0 commit comments

Comments
 (0)