| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | archinstall/lib/luks.py | 6 | ||||
| -rw-r--r-- | docs/examples/python.rst | 4 | ||||
| -rw-r--r-- | docs/index.rst | 2 | ||||
| -rw-r--r-- | docs/installing/guided.rst | 4 | ||||
| -rw-r--r-- | docs/installing/python.rst | 4 |
diff --git a/archinstall/lib/luks.py b/archinstall/lib/luks.py index 19c21795..57163e35 100644 --- a/archinstall/lib/luks.py +++ b/archinstall/lib/luks.py @@ -94,8 +94,8 @@ class luks2(): else: raise err - if b'Command successful.' not in b''.join(cmd_handle): - raise DiskError(f'Could not encrypt volume "{partition.path}": {o}') + if b'Command successful.' not in (cmd_output := b''.join(cmd_handle)): + raise DiskError(f'Could not encrypt volume "{partition.path}": {cmd_output}') return key_file @@ -126,4 +126,4 @@ class luks2(): def format(self, path): if (handle := sys_command(f"/usr/bin/cryptsetup -q -v luksErase {path}")).exit_code != 0: - raise DiskError(f'Could not format {path} with {self.filesystem} because: {b"".join(handle)}')
\ No newline at end of file + raise DiskError(f'Could not format {path} with {self.filesystem} because: {b"".join(handle)}') diff --git a/docs/examples/python.rst b/docs/examples/python.rst index 04f2f43a..f6388738 100644 --- a/docs/examples/python.rst +++ b/docs/examples/python.rst @@ -9,9 +9,9 @@ The way the library is invoked in module mode is limited to executing scripts un It's there for important to place any script or profile you wish to invoke in the examples folder prior to building and installing. Pre-requisites -------------- +-------------- -We'll assume you've followed the `installing.python.manual`_ method. +We'll assume you've followed the :ref:`installing.python.manual` method. Before actually installing the library, you will need to place your custom installer-scripts under `./archinstall/examples/` as a python file. More on how you create these in the next section. diff --git a/docs/index.rst b/docs/index.rst index c03cc451..eef368c5 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -2,7 +2,7 @@ python-archinstall Documentation ================================ | **python-archinstall** *(or, archinstall for short)* is a helper library to install Arch Linux and manage services, packages and other things. -| It comes packaged with different pre-configured installers, such as the `installing.guided`_ installer. +| It comes packaged with different pre-configured installers, such as the :ref:`guided <installing.guided>` installer. | | A demo can be viewed here: `https://www.youtube.com/watch?v=9Xt7X_Iqg6E <https://www.youtube.com/watch?v=9Xt7X_Iqg6E>`_ which uses the default guided installer. diff --git a/docs/installing/guided.rst b/docs/installing/guided.rst index 92324589..7ce081ca 100644 --- a/docs/installing/guided.rst +++ b/docs/installing/guided.rst @@ -100,6 +100,8 @@ Default is :code:`Archinstall` The hostname in which the machine will identify itself on the local network. This step is optional, but a default hostname of `Archinstall` will be set if none is selected. +.. _root_password: + Root password ------------- @@ -115,7 +117,7 @@ Super User (sudo) ----------------- .. warning:: - This step only applies if you correctly skipped the previous step :ref:`root_password`_ which also makes this step mandatory. + This step only applies if you correctly skipped :ref:`the previous step <root_password>` which also makes this step mandatory. If the previous step was skipped, and only if it is skipped. This step enables you to create a :code:`sudo` enabled user with a password. diff --git a/docs/installing/python.rst b/docs/installing/python.rst index 44606166..94cfb243 100644 --- a/docs/installing/python.rst +++ b/docs/installing/python.rst @@ -10,7 +10,7 @@ But the library can be installed manually as well. This is not required if you're running archinstall on a pre-built ISO. The installation is only required if you're creating your own scripted installations. Using pacman ----------- +------------ Archinstall is on the `official repositories <https://wiki.archlinux.org/index.php/Official_repositories>`_. @@ -44,7 +44,7 @@ Or as a user module: Which will allow you to start using the library. -.. _installing.python.manual +.. _installing.python.manual: Manual installation ------------------- |