Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/__init__.py
diff options
context:
space:
mode:
authorYash Tripathi <tripathiyash97@gmail.com>2021-06-06 08:18:34 +0530
committerGitHub <noreply@github.com>2021-06-06 08:18:34 +0530
commit419b058b6f663e75f4df9a33b87d06f7722dc82a (patch)
tree440f8395f6a3bcd5cbf80cfd396295cc6d1d1315 /archinstall/__init__.py
parenta4033a7d3a94916f2b4972d212f9d0069fca39cd (diff)
added support for seperating credentials from config
Diffstat (limited to 'archinstall/__init__.py')
-rw-r--r--archinstall/__init__.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/archinstall/__init__.py b/archinstall/__init__.py
index 0b799d5b..84cf24a2 100644
--- a/archinstall/__init__.py
+++ b/archinstall/__init__.py
@@ -30,6 +30,7 @@ storage['__version__'] = __version__
def initialize_arguments():
config = {}
parser.add_argument("--config", nargs="?", help="JSON configuration file or URL")
+ parser.add_argument("--creds", nargs="?", help="JSON credentials configuration file or URL")
parser.add_argument("--silent", action="store_true",
help="Warning!!! No prompts, ignored if config is not passed")
parser.add_argument("--script", default="guided", nargs="?", help="Script to run for installation", type=str)
@@ -42,6 +43,9 @@ def initialize_arguments():
if not parsed_url.scheme: # The Profile was not a direct match on a remote URL, it must be a local file.
with open(args.config) as file:
config = json.load(file)
+ if args.creds is not None:
+ with open(args.creds) as file:
+ config.update(json.load(file))
else: # Attempt to load the configuration from the URL.
with urllib.request.urlopen(urllib.request.Request(args.config, headers={'User-Agent': 'ArchInstall'})) as response:
config = json.loads(response.read())