Skip to content

Commit de709d7

Browse files
committed
Make network configuration mandatory with explicit "No network" option
1 parent b2f4131 commit de709d7

6 files changed

Lines changed: 15 additions & 1 deletion

File tree

archinstall/lib/global_menu.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ def _get_menu_options(self) -> list[MenuItem]:
134134
action=select_network,
135135
value={},
136136
preview_action=self._prev_network_config,
137+
mandatory=True,
137138
key='network_config',
138139
),
139140
MenuItem(

archinstall/lib/models/network.py

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

1617
def display_msg(self) -> str:
1718
match self:
@@ -23,6 +24,8 @@ def display_msg(self) -> str:
2324
return tr('Use Network Manager (iwd backend)')
2425
case NicType.MANUAL:
2526
return tr('Manual configuration')
27+
case NicType.NONE:
28+
return tr('No network')
2629

2730

2831
class _NicSerialization(TypedDict):

archinstall/lib/network/network_handler.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ 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
4042

4143

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

archinstall/lib/network/network_menu.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ async def select_network(preset: NetworkConfiguration | None) -> NetworkConfigur
172172
"""
173173

174174
items = [MenuItem(n.display_msg(), value=n) for n in NicType]
175-
group = MenuItemGroup(items, sort_items=True)
175+
group = MenuItemGroup(items, sort_items=False)
176176

177177
if preset:
178178
group.set_selected_by_value(preset.type)
@@ -205,5 +205,7 @@ async def select_network(preset: NetworkConfiguration | None) -> NetworkConfigur
205205

206206
if nics:
207207
return NetworkConfiguration(NicType.MANUAL, nics)
208+
case NicType.NONE:
209+
return NetworkConfiguration(NicType.NONE)
208210

209211
return preset

archinstall/locales/base.pot

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,9 @@ msgstr ""
633633
msgid "Manual configuration"
634634
msgstr ""
635635

636+
msgid "No network"
637+
msgstr ""
638+
636639
msgid "Mark/Unmark a partition as compressed (btrfs only)"
637640
msgstr ""
638641

archinstall/locales/uk/LC_MESSAGES/base.po

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -646,6 +646,9 @@ msgstr "Оберіть інтерфейс для додавання"
646646
msgid "Manual configuration"
647647
msgstr "Ручне налаштування"
648648

649+
msgid "No network"
650+
msgstr "Без мережі"
651+
649652
msgid "Mark/Unmark a partition as compressed (btrfs only)"
650653
msgstr "Позначити/зняти позначку розділу як стисненого (лише btrfs)"
651654

0 commit comments

Comments
 (0)