From b94fee2242b74dacc3f53021c5ff30ce2b1f789a Mon Sep 17 00:00:00 2001 From: Dylan Taylor Date: Wed, 19 May 2021 15:41:44 -0400 Subject: very minor whitespace fixes --- archinstall/lib/general.py | 2 +- archinstall/lib/networking.py | 2 ++ setup.cfg | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) 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 -- cgit v1.2.3-70-g09d2 From 29ee237d805fa606b8df0d5a6d97eed604489fc7 Mon Sep 17 00:00:00 2001 From: Dylan Taylor Date: Wed, 19 May 2021 17:22:32 -0400 Subject: Fix configuration sample link --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 100288f3..7590f3e5 100644 --- a/README.md +++ b/README.md @@ -27,10 +27,10 @@ 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 [config](examples/config-sample.json) Prequisites: - 1. Edit the [config](examples/base-config.json) according to your requirements. + 1. Edit the [config](examples/config-sample.json) according to your requirements. Assuming you are on a Arch Linux live-ISO and booted into EFI mode. -- cgit v1.2.3-70-g09d2 From 434ed8f67fbe4a03c8d7fe8f8a9c41843895e122 Mon Sep 17 00:00:00 2001 From: Dylan Taylor Date: Wed, 19 May 2021 17:24:51 -0400 Subject: Point out that a URL can be used as well in README --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7590f3e5..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/config-sample.json) +## Running from a declarative configuration file or URL Prequisites: - 1. Edit the [config](examples/config-sample.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 --vars '' + # python -m archinstall --config --vars '' # Help? -- cgit v1.2.3-70-g09d2