| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | archinstall/lib/general.py | 5 | ||||
| -rw-r--r-- | examples/guided.py | 6 |
diff --git a/archinstall/lib/general.py b/archinstall/lib/general.py index dc94b063..97ad1565 100644 --- a/archinstall/lib/general.py +++ b/archinstall/lib/general.py @@ -45,7 +45,10 @@ class JSON_Encoder: else: val = JSON_Encoder._encode(val) del(obj[key]) - obj[JSON_Encoder._encode(key)] = val + if type(key) == str and key[0] == '!': + obj[JSON_Encoder._encode(key)] = '******' + else: + obj[JSON_Encoder._encode(key)] = val return obj elif hasattr(obj, 'json'): return obj.json() diff --git a/examples/guided.py b/examples/guided.py index 5fdc318b..cf7c3ef3 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -150,9 +150,9 @@ if archinstall.arguments['harddrive'].has_partitions(): archinstall.arguments['harddrive'].keep_partitions = False # Get disk encryption password (or skip if blank) -if not archinstall.arguments.get('encryption-password', None): - archinstall.arguments['encryption-password'] = archinstall.get_password(prompt='Enter disk encryption password (leave blank for no encryption): ') -archinstall.arguments['harddrive'].encryption_password = archinstall.arguments['encryption-password'] +if not archinstall.arguments.get('!encryption-password', None): + archinstall.arguments['!encryption-password'] = archinstall.get_password(prompt='Enter disk encryption password (leave blank for no encryption): ') +archinstall.arguments['harddrive'].encryption_password = archinstall.arguments['!encryption-password'] # Get the hostname for the machine if not archinstall.arguments.get('hostname', None): |