Merge pull request #481 from dylanmtaylor/minor-formatting-cleanup

Some very minor cleanup
This commit is contained in:
Anton Hvornum 2021-05-20 08:07:02 +02:00 committed by GitHub
commit 71ab52178c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 5 deletions

View File

@ -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?

View File

@ -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
return False

View File

@ -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:

View File

@ -22,7 +22,7 @@ classifers =
[options]
packages = find:
python_requires = >= 3.8
[options.packages.find]
include =
archinstall