Only adding disk encryption to user_credentials.json when supplied.
This commit is contained in:
parent
9fe4dbc50e
commit
813afa1507
|
|
@ -243,15 +243,16 @@ def perform_filesystem_operations():
|
||||||
fs.load_layout(archinstall.storage['disk_layouts'][drive.path])
|
fs.load_layout(archinstall.storage['disk_layouts'][drive.path])
|
||||||
|
|
||||||
def perform_installation(mountpoint):
|
def perform_installation(mountpoint):
|
||||||
user_credentials = json.dumps({
|
user_credentials = {
|
||||||
"!users" : archinstall.arguments['!users'],
|
"!users" : archinstall.arguments['!users'],
|
||||||
"!superusers" : archinstall.arguments['!users'],
|
"!superusers" : archinstall.arguments['!users'],
|
||||||
"!root-password" : archinstall.arguments['!users'],
|
"!root-password" : archinstall.arguments['!users'],
|
||||||
"!encryption-password" : archinstall.arguments['!encryption-password'],
|
}
|
||||||
}, indent=4, sort_keys=True, cls=archinstall.UNSAFE_JSON)
|
if archinstall.arguments.get('!encryption-password'):
|
||||||
|
user_credentials["!encryption-password"] = archinstall.arguments.get('!encryption-password')
|
||||||
|
|
||||||
with open("/var/log/archinstall/user_credentials.json", "w") as config_file:
|
with open("/var/log/archinstall/user_credentials.json", "w") as config_file:
|
||||||
config_file.write(user_credentials)
|
config_file.write(json.dumps(user_credentials, indent=4, sort_keys=True, cls=archinstall.UNSAFE_JSON))
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Performs the installation steps on a block device.
|
Performs the installation steps on a block device.
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue