Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/scripts
diff options
context:
space:
mode:
authorDaniel Girtler <blackrabbit256@gmail.com>2023-10-18 16:57:44 +1100
committerGitHub <noreply@github.com>2023-10-18 16:57:44 +1100
commitce9828c2934937217daee6ba178dafedf6cabe6d (patch)
tree0c9540f07c6756426e50786a04b4436ef3b51577 /archinstall/scripts
parent8117c0eed8cdeffc542026a82a51cb10fd6c1ec4 (diff)
Fixes for prev PR (#2175)
* Fixes for prev PR * Update --------- Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com>
Diffstat (limited to 'archinstall/scripts')
-rw-r--r--archinstall/scripts/guided.py7
-rw-r--r--archinstall/scripts/only_hd.py13
-rw-r--r--archinstall/scripts/swiss.py12
3 files changed, 1 insertions, 31 deletions
diff --git a/archinstall/scripts/guided.py b/archinstall/scripts/guided.py
index fdf05c99..6acbdbf3 100644
--- a/archinstall/scripts/guided.py
+++ b/archinstall/scripts/guided.py
@@ -1,4 +1,3 @@
-import os
from pathlib import Path
from typing import Any, TYPE_CHECKING, Optional
@@ -15,7 +14,6 @@ from archinstall.lib.mirrors import use_mirrors, add_custom_mirrors
from archinstall.lib.models import AudioConfiguration
from archinstall.lib.models.bootloader import Bootloader
from archinstall.lib.models.network_configuration import NetworkConfiguration
-from archinstall.lib.networking import check_mirror_reachable
from archinstall.lib.profile.profiles_handler import profile_handler
if TYPE_CHECKING:
@@ -232,11 +230,6 @@ def perform_installation(mountpoint: Path):
debug(f"Disk states after installing: {disk.disk_layouts()}")
-if archinstall.arguments.get('skip-mirror-check', False) is False and check_mirror_reachable() is False:
- log_file = os.path.join(archinstall.storage.get('LOG_PATH', None), archinstall.storage.get('LOG_FILE', None))
- info(f"Arch Linux mirrors are not reachable. Please check your internet connection and the log file '{log_file}'.")
- exit(1)
-
if not archinstall.arguments.get('silent'):
ask_user_questions()
diff --git a/archinstall/scripts/only_hd.py b/archinstall/scripts/only_hd.py
index d0ee1e39..2293cbee 100644
--- a/archinstall/scripts/only_hd.py
+++ b/archinstall/scripts/only_hd.py
@@ -1,16 +1,10 @@
-import os
from pathlib import Path
import archinstall
-from archinstall import info, debug
+from archinstall import debug
from archinstall.lib.installer import Installer
from archinstall.lib.configuration import ConfigurationOutput
from archinstall.lib import disk
-from archinstall.lib.networking import check_mirror_reachable
-
-if archinstall.arguments.get('help'):
- print("See `man archinstall` for help.")
- exit(0)
def ask_user_questions():
@@ -58,11 +52,6 @@ def perform_installation(mountpoint: Path):
debug(f"Disk states after installing: {disk.disk_layouts()}")
-if archinstall.arguments.get('skip-mirror-check', False) is False and check_mirror_reachable() is False:
- log_file = os.path.join(archinstall.storage.get('LOG_PATH', None), archinstall.storage.get('LOG_FILE', None))
- info(f"Arch Linux mirrors are not reachable. Please check your internet connection and the log file '{log_file}'")
- exit(1)
-
if not archinstall.arguments.get('silent'):
ask_user_questions()
diff --git a/archinstall/scripts/swiss.py b/archinstall/scripts/swiss.py
index c04ccca4..1db304a8 100644
--- a/archinstall/scripts/swiss.py
+++ b/archinstall/scripts/swiss.py
@@ -1,4 +1,3 @@
-import os
from enum import Enum
from pathlib import Path
from typing import TYPE_CHECKING, Any, Dict, Optional
@@ -10,7 +9,6 @@ from archinstall.lib import models
from archinstall.lib import disk
from archinstall.lib import locale
from archinstall.lib.models import AudioConfiguration
-from archinstall.lib.networking import check_mirror_reachable
from archinstall.lib.profile.profiles_handler import profile_handler
from archinstall.lib import menu
from archinstall.lib.global_menu import GlobalMenu
@@ -21,11 +19,6 @@ if TYPE_CHECKING:
_: Any
-if archinstall.arguments.get('help'):
- print("See `man archinstall` for help.")
- exit(0)
-
-
class ExecutionMode(Enum):
Full = 'full'
Lineal = 'lineal'
@@ -290,11 +283,6 @@ def perform_installation(mountpoint: Path, exec_mode: ExecutionMode):
debug(f"Disk states after installing: {disk.disk_layouts()}")
-if not check_mirror_reachable():
- log_file = os.path.join(archinstall.storage.get('LOG_PATH', None), archinstall.storage.get('LOG_FILE', None))
- info(f"Arch Linux mirrors are not reachable. Please check your internet connection and the log file '{log_file}'")
- exit(1)
-
param_mode = archinstall.arguments.get('mode', ExecutionMode.Full.value).lower()
try: