Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2021-05-20 08:07:02 +0200
committerGitHub <noreply@github.com>2021-05-20 08:07:02 +0200
commit71ab52178c143d3f9b3d2d7090a51404913d9939 (patch)
tree1cc07aa1f2874c5a54ed2a8df151462569f9da75
parent182babf33a8fd5ff08cdf5774b0a87c8e9386384 (diff)
parent434ed8f67fbe4a03c8d7fe8f8a9c41843895e122 (diff)
Merge pull request #481 from dylanmtaylor/minor-formatting-cleanup
Some very minor cleanup
-rw-r--r--README.md6
-rw-r--r--archinstall/lib/general.py2
-rw-r--r--archinstall/lib/networking.py2
-rw-r--r--setup.cfg2
4 files changed, 7 insertions, 5 deletions
diff --git a/README.md b/README.md
index 100288f3..21fc6d80 100644
--- a/README.md
+++ b/README.md
@@ -27,14 +27,14 @@ Assuming you are on an Arch Linux live-ISO and booted into EFI mode.
# python -m archinstall --script guided
-## Running from a declarative [config](examples/base-config.json)
+## Running from a declarative configuration file or URL
Prequisites:
- 1. Edit the [config](examples/base-config.json) according to your requirements.
+ 1. Edit the [configuration file](examples/config-sample.json) according to your requirements.
Assuming you are on a Arch Linux live-ISO and booted into EFI mode.
- # python -m archinstall --config <path to config file> --vars '<space_seperated KEY=VALUE pairs>'
+ # python -m archinstall --config <path to config file or URL> --vars '<space_seperated KEY=VALUE pairs>'
# Help?
diff --git a/archinstall/lib/general.py b/archinstall/lib/general.py
index cec3891a..81793cb8 100644
--- a/archinstall/lib/general.py
+++ b/archinstall/lib/general.py
@@ -365,4 +365,4 @@ def pid_exists(pid: int):
try:
return any(subprocess.check_output(['/usr/bin/ps', '--no-headers', '-o', 'pid', '-p', str(pid)]).strip())
except subprocess.CalledProcessError:
- return False \ No newline at end of file
+ return False
diff --git a/archinstall/lib/networking.py b/archinstall/lib/networking.py
index eb11a47e..0643c9cf 100644
--- a/archinstall/lib/networking.py
+++ b/archinstall/lib/networking.py
@@ -10,6 +10,7 @@ from .general import SysCommand
from .output import log
from .storage import storage
+
def get_hw_addr(ifname):
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
info = fcntl.ioctl(s.fileno(), 0x8927, struct.pack('256s', bytes(ifname, 'utf-8')[:15]))
@@ -35,6 +36,7 @@ def check_mirror_reachable():
return False
+
def enrich_iface_types(interfaces: dict):
result = {}
for iface in interfaces:
diff --git a/setup.cfg b/setup.cfg
index 79dff732..e5d79ef3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,7 +22,7 @@ classifers =
[options]
packages = find:
python_requires = >= 3.8
-
+
[options.packages.find]
include =
archinstall