Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archinstall/lib/disk/blockdevice.py1
-rw-r--r--archinstall/lib/storage.py2
-rw-r--r--docs/help/discord.rst6
-rw-r--r--examples/guided.py2
4 files changed, 6 insertions, 5 deletions
diff --git a/archinstall/lib/disk/blockdevice.py b/archinstall/lib/disk/blockdevice.py
index fea026a1..fad04c7b 100644
--- a/archinstall/lib/disk/blockdevice.py
+++ b/archinstall/lib/disk/blockdevice.py
@@ -11,6 +11,7 @@ from ..general import SysCommand
class BlockDevice:
def __init__(self, path, info=None):
if not info:
+ from .helpers import all_disks
# If we don't give any information, we need to auto-fill it.
# Otherwise any subsequent usage will break.
info = all_disks()[path].info
diff --git a/archinstall/lib/storage.py b/archinstall/lib/storage.py
index 67f8e716..ae330382 100644
--- a/archinstall/lib/storage.py
+++ b/archinstall/lib/storage.py
@@ -4,7 +4,7 @@ import os
# 1. In the git repository, where ./profiles/ exist
# 2. When executing from a remote directory, but targeted a script that starts from the git repository
# 3. When executing as a python -m archinstall module where profiles exist one step back for library reasons.
-# (4. Added the ~/.config directory as a additional option for future reasons)
+# (4. Added the ~/.config directory as an additional option for future reasons)
#
# And Keeping this in dict ensures that variables are shared across imports.
storage = {
diff --git a/docs/help/discord.rst b/docs/help/discord.rst
index ce15766a..73727c35 100644
--- a/docs/help/discord.rst
+++ b/docs/help/discord.rst
@@ -3,12 +3,12 @@
Discord
=======
-There's a discord channel which is frequent by some `contributors <https://github.com/archlinux/archinstall/graphs/contributors>`_.
+There's a discord channel which is frequented by some contributors <https://github.com/archlinux/archinstall/graphs/contributors>`_.
To join the server, head over to `https://discord.gg/cqXU88y <https://discord.gg/cqXU88y>`_'s server and join in.
-There's not many rules other than common sense and treat others with respect.
+There's not many rules other than common sense and to treat others with respect.
There's the `@Party Animals` role if you want notifications of new releases which is posted in the `#Release Party` channel.
Another thing is the `@Contributors` role which you can get by writing `!verify` and verify that you're a contributor.
-Hop in, I hope to see you there! : ) \ No newline at end of file
+Hop in, I hope to see you there! : )
diff --git a/examples/guided.py b/examples/guided.py
index 50fb3a43..45395add 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -137,7 +137,7 @@ def ask_user_questions():
# Ask for additional users (super-user if root pw was not set)
if not archinstall.arguments.get('!root-password', None) and not archinstall.arguments.get('superusers', None):
archinstall.arguments['superusers'] = archinstall.ask_for_superuser_account('Create a required super-user with sudo privileges: ', forced=True)
- users, superusers = archinstall.ask_for_additional_users('Enter a username to create a additional user (leave blank to skip & continue): ')
+ users, superusers = archinstall.ask_for_additional_users('Enter a username to create an additional user (leave blank to skip & continue): ')
archinstall.arguments['users'] = users
archinstall.arguments['superusers'] = {**archinstall.arguments['superusers'], **superusers}