Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall
diff options
context:
space:
mode:
authorWerner Llácer <wllacer@gmail.com>2022-03-28 13:44:10 +0200
committerGitHub <noreply@github.com>2022-03-28 13:44:10 +0200
commite85c9b65315498ab4701ea31c079d198eba8d9ac (patch)
treee19c6066c3ba0d27f724f783431165199b98c991 /archinstall
parent69bd88a7f9f537b8015915110ee9e4333be31fc1 (diff)
Issues with Network Management and user management in menu (#1036)
* A problem with default values treatment at superusers (and users) on the main menu * Solving issues when changing the selection of nic, ask_to_configure_network failed in several places. Solved, temporarily with the creation of __getitem__ and get methods at NetworkManager * Accept old style definitions for nic * flake8 complains * log string corrected (issue 1039) * Correct exit when no disk is selected and we don't wish to continue
Diffstat (limited to 'archinstall')
-rw-r--r--archinstall/lib/installer.py12
-rw-r--r--archinstall/lib/menu/selection_menu.py3
-rw-r--r--archinstall/lib/models/network_configuration.py46
3 files changed, 52 insertions, 9 deletions
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 9060083a..13bca56b 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -149,7 +149,7 @@ class Installer:
# We avoid printing /mnt/<log path> because that might confuse people if they note it down
# and then reboot, and a identical log file will be found in the ISO medium anyway.
- print(_("[!] A log file has been created here: {} {}").format(os.path.join(storage['LOG_PATH'], storage['LOG_FILE'])))
+ print(_("[!] A log file has been created here: {}").format(os.path.join(storage['LOG_PATH'], storage['LOG_FILE'])))
print(_(" Please submit this issue (and file) to https://github.com/archlinux/archinstall/issues"))
raise args[1]
@@ -956,9 +956,9 @@ class Installer:
def enable_sudo(self, entity: str, group :bool = False) -> bool:
self.log(f'Enabling sudo permissions for {entity}.', level=logging.INFO)
-
+
sudoers_dir = f"{self.target}/etc/sudoers.d"
-
+
# Creates directory if not exists
if not (sudoers_path := pathlib.Path(sudoers_dir)).exists():
sudoers_path.mkdir(parents=True)
@@ -967,7 +967,7 @@ class Installer:
# Appends a reference to the sudoers file, because if we are here sudoers.d did not exist yet
with open(f'{self.target}/etc/sudoers', 'a') as sudoers:
sudoers.write('@includedir /etc/sudoers.d\n')
-
+
# We count how many files are there already so we know which number to prefix the file with
num_of_rules_already = len(os.listdir(sudoers_dir))
file_num_str = "{:02d}".format(num_of_rules_already) # We want 00_user1, 01_user2, etc
@@ -977,10 +977,10 @@ class Installer:
safe_entity_file_name = re.sub(r'(\\|\/|:|\*|\?|"|<|>|\|)', '', entity)
rule_file_name = f"{sudoers_dir}/{file_num_str}_{safe_entity_file_name}"
-
+
with open(rule_file_name, 'a') as sudoers:
sudoers.write(f'{"%" if group else ""}{entity} ALL=(ALL) ALL\n')
-
+
# Guarantees sudoer conf file recommended perms
os.chmod(pathlib.Path(rule_file_name), 0o440)
diff --git a/archinstall/lib/menu/selection_menu.py b/archinstall/lib/menu/selection_menu.py
index 9b40b0e7..af896d58 100644
--- a/archinstall/lib/menu/selection_menu.py
+++ b/archinstall/lib/menu/selection_menu.py
@@ -502,6 +502,7 @@ class GlobalMenu(GeneralMenu):
_('Specify superuser account'),
lambda preset: self._create_superuser_account(),
exec_func=lambda n,v:self._users_resynch(),
+ default={},
dependencies_not=['!root-password'],
display_func=lambda x: self._display_superusers())
self._menu_options['!users'] = \
@@ -656,7 +657,7 @@ class GlobalMenu(GeneralMenu):
choice = Menu(prompt, ['yes', 'no'], default_option='yes').run()
if choice == 'no':
- return self._select_harddrives()
+ exit(1)
return harddrives
diff --git a/archinstall/lib/models/network_configuration.py b/archinstall/lib/models/network_configuration.py
index f1ee4c3f..4b57da00 100644
--- a/archinstall/lib/models/network_configuration.py
+++ b/archinstall/lib/models/network_configuration.py
@@ -40,11 +40,32 @@ class NetworkConfiguration:
return self.__dict__
@classmethod
- def parse_arguments(cls, config: Dict[str, str]) -> Optional["NetworkConfiguration"]:
+ def parse_arguments(cls, config: Union[str,Dict[str, str]]) -> Optional["NetworkConfiguration"]:
nic_type = config.get('type', None)
if not nic_type:
- return None
+ # old style definitions
+ if isinstance(config,str): # is a ISO network
+ return NetworkConfiguration(NicType.ISO)
+ elif config.get('NetworkManager'): # is a network manager configuration
+ return NetworkConfiguration(NicType.NM)
+ elif 'ip' in config:
+ return NetworkConfiguration(
+ NicType.MANUAL,
+ iface=config.get('nic', ''),
+ ip=config.get('ip'),
+ gateway=config.get('gateway', ''),
+ dns=config.get('dns', []),
+ dhcp=False
+ )
+ elif 'nic' in config:
+ return NetworkConfiguration(
+ NicType.MANUAL,
+ iface=config.get('nic', ''),
+ dhcp=True
+ )
+ else: # not recognized
+ return None
try:
type = NicType(nic_type)
@@ -95,3 +116,24 @@ class NetworkConfiguration:
installation.configure_nic(self)
installation.enable_service('systemd-networkd')
installation.enable_service('systemd-resolved')
+
+ def get(self, key :str, default_value :Any = None) -> Any:
+ result = self.__getitem__(key)
+ if result is None:
+ return default_value
+ else:
+ return result
+
+ def __getitem__(self, key :str) -> Any:
+ if key == 'type':
+ return self.type
+ elif key == 'iface':
+ return self.iface
+ elif key == 'gateway':
+ return self.gateway
+ elif key == 'dns':
+ return self.dns
+ elif key == 'dhcp':
+ return self.dhcp
+ else:
+ raise KeyError(f"key {key} not available at NetworkConfiguration")