Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib/disk
diff options
context:
space:
mode:
Diffstat (limited to 'archinstall/lib/disk')
-rw-r--r--archinstall/lib/disk/btrfs/__init__.py4
-rw-r--r--archinstall/lib/disk/btrfs/btrfs_helpers.py4
-rw-r--r--archinstall/lib/disk/btrfs/btrfspartition.py4
-rw-r--r--archinstall/lib/disk/btrfs/btrfssubvolume.py4
-rw-r--r--archinstall/lib/disk/filesystem.py4
-rw-r--r--archinstall/lib/disk/helpers.py6
6 files changed, 13 insertions, 13 deletions
diff --git a/archinstall/lib/disk/btrfs/__init__.py b/archinstall/lib/disk/btrfs/__init__.py
index 84b9c0f6..90c58145 100644
--- a/archinstall/lib/disk/btrfs/__init__.py
+++ b/archinstall/lib/disk/btrfs/__init__.py
@@ -73,7 +73,7 @@ def create_subvolume(installation :Installer, subvolume_location :Union[pathlib.
def _has_option(option :str,options :list) -> bool:
""" auxiliary routine to check if an option is present in a list.
- we check if the string appears in one of the options, 'cause it can appear in severl forms (option, option=val,...)
+ we check if the string appears in one of the options, 'cause it can appear in several forms (option, option=val,...)
"""
if not options:
return False
@@ -110,7 +110,7 @@ def manage_btrfs_subvolumes(installation :Installer,
subvolumes = partition['btrfs']['subvolumes']
for name, right_hand in subvolumes.items():
try:
- # we normalize the subvolume name (getting rid of slash at the start if exists. In our implemenation has no semantic load - every subvolume is created from the top of the hierarchy- and simplifies its further use
+ # we normalize the subvolume name (getting rid of slash at the start if exists. In our implementation has no semantic load - every subvolume is created from the top of the hierarchy- and simplifies its further use
if name.startswith('/'):
name = name[1:]
# renormalize the right hand.
diff --git a/archinstall/lib/disk/btrfs/btrfs_helpers.py b/archinstall/lib/disk/btrfs/btrfs_helpers.py
index d577d82b..5fa94314 100644
--- a/archinstall/lib/disk/btrfs/btrfs_helpers.py
+++ b/archinstall/lib/disk/btrfs/btrfs_helpers.py
@@ -10,7 +10,7 @@ from .btrfssubvolume import BtrfsSubvolume
def mount_subvolume(installation, device, name, subvolume_information):
- # we normalize the subvolume name (getting rid of slash at the start if exists. In our implemenation has no semantic load.
+ # we normalize the subvolume name (getting rid of slash at the start if exists. In our implementation has no semantic load.
# Every subvolume is created from the top of the hierarchy- and simplifies its further use
name = name.lstrip('/')
@@ -53,7 +53,7 @@ def setup_subvolumes(installation, partition_dict):
"""
log(f"Setting up subvolumes: {partition_dict['btrfs']['subvolumes']}", level=logging.INFO, fg="gray")
for name, right_hand in partition_dict['btrfs']['subvolumes'].items():
- # we normalize the subvolume name (getting rid of slash at the start if exists. In our implemenation has no semantic load.
+ # we normalize the subvolume name (getting rid of slash at the start if exists. In our implementation has no semantic load.
# Every subvolume is created from the top of the hierarchy- and simplifies its further use
name = name.lstrip('/')
diff --git a/archinstall/lib/disk/btrfs/btrfspartition.py b/archinstall/lib/disk/btrfs/btrfspartition.py
index 299357b8..6f7487e4 100644
--- a/archinstall/lib/disk/btrfs/btrfspartition.py
+++ b/archinstall/lib/disk/btrfs/btrfspartition.py
@@ -62,13 +62,13 @@ class BTRFSPartition(Partition):
if not installation:
installation = storage.get('installation_session')
- # Determain if the path given, is an absolute path or a releative path.
+ # Determain if the path given, is an absolute path or a relative path.
# We do this by checking if the path contains a known mountpoint.
if str(subvolume)[0] == '/':
if filesystems := findmnt(subvolume, traverse=True).get('filesystems'):
if (target := filesystems[0].get('target')) and target != '/' and str(subvolume).startswith(target):
# Path starts with a known mountpoint which isn't /
- # Which means it's an absolut path to a mounted location.
+ # Which means it's an absolute path to a mounted location.
pass
else:
# Since it's not an absolute position with a known start.
diff --git a/archinstall/lib/disk/btrfs/btrfssubvolume.py b/archinstall/lib/disk/btrfs/btrfssubvolume.py
index a96e2a94..bc7db612 100644
--- a/archinstall/lib/disk/btrfs/btrfssubvolume.py
+++ b/archinstall/lib/disk/btrfs/btrfssubvolume.py
@@ -68,9 +68,9 @@ class BtrfsSubvolume:
from .btrfs_helpers import subvolume_info_from_path
# TODO: Make this function traverse storage['MOUNT_POINT'] and find the first
- # occurance of a mountpoint that is a btrfs volume instead of lazy assume / is a subvolume.
+ # occurrence of a mountpoint that is a btrfs volume instead of lazy assume / is a subvolume.
# It would also be nice if it could use findmnt(self.full_path) and traverse backwards
- # finding the last occurance of a subvolume which 'self' belongs to.
+ # finding the last occurrence of a subvolume which 'self' belongs to.
if volume := subvolume_info_from_path(storage['MOUNT_POINT']):
return self.full_path == volume.full_path
diff --git a/archinstall/lib/disk/filesystem.py b/archinstall/lib/disk/filesystem.py
index f94b4b47..cc29a491 100644
--- a/archinstall/lib/disk/filesystem.py
+++ b/archinstall/lib/disk/filesystem.py
@@ -74,7 +74,7 @@ class Filesystem:
raise KeyError(f"Could not create a GPT label on {self}")
elif self.mode == MBR:
if not self.parted_mklabel(self.blockdevice.device, "msdos"):
- raise KeyError(f"Could not create a MSDOS label on {self}")
+ raise KeyError(f"Could not create a MS-DOS label on {self}")
self.blockdevice.flush_cache()
time.sleep(3)
@@ -221,7 +221,7 @@ class Filesystem:
raise KeyError(f"Could not create a GPT label on {self}")
elif self.mode == MBR:
if not self.parted_mklabel(self.blockdevice.device, "msdos"):
- raise KeyError(f"Could not create a MSDOS label on {self}")
+ raise KeyError(f"Could not create a MS-DOS label on {self}")
self.blockdevice.flush_cache()
diff --git a/archinstall/lib/disk/helpers.py b/archinstall/lib/disk/helpers.py
index 65d7a006..47cc81c4 100644
--- a/archinstall/lib/disk/helpers.py
+++ b/archinstall/lib/disk/helpers.py
@@ -112,7 +112,7 @@ def cleanup_bash_escapes(data :str) -> str:
def blkid(cmd :str) -> Dict[str, Any]:
if '-o' in cmd and '-o export' not in cmd:
- raise ValueError(f"blkid() requires '-o export' to be used and can therefor not continue reliably.")
+ raise ValueError(f"blkid() requires '-o export' to be used and can therefore not continue reliably.")
elif '-o' not in cmd:
cmd += ' -o export'
@@ -133,7 +133,7 @@ def blkid(cmd :str) -> Dict[str, Any]:
key, val = line.split('=', 1)
if key.lower() == 'devname':
devname = val
- # Lowercase for backwards compatability with all_disks() previous use cases
+ # Lowercase for backwards compatibility with all_disks() previous use cases
result[devname] = {
"path": devname,
"PATH": devname
@@ -475,7 +475,7 @@ def has_mountpoint(partition: Union[dict,Partition,MapperDev], target: str, stri
Input parms:
:parm partition the partition we check
- :type Either a Partition object or a dict with the contents of a partition definiton in the disk_layouts schema
+ :type Either a Partition object or a dict with the contents of a partition definition in the disk_layouts schema
:parm target (a string representing a mount path we want to check for.
:type str