Merge branch 'master' into enhancement-systemd-service-wrapper
This commit is contained in:
commit
aee0440621
|
|
@ -88,7 +88,7 @@ def log(*args, **kwargs):
|
||||||
# Attempt to colorize the output if supported
|
# Attempt to colorize the output if supported
|
||||||
# Insert default colors and override with **kwargs
|
# Insert default colors and override with **kwargs
|
||||||
if supports_color():
|
if supports_color():
|
||||||
kwargs = {'bg' : 'black', 'fg': 'white', **kwargs}
|
kwargs = {'fg': 'white', **kwargs}
|
||||||
string = stylize_output(string, **kwargs)
|
string = stylize_output(string, **kwargs)
|
||||||
|
|
||||||
# If a logfile is defined in storage,
|
# If a logfile is defined in storage,
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ def get_password(prompt="Enter a password: "):
|
||||||
while (passwd := getpass.getpass(prompt)):
|
while (passwd := getpass.getpass(prompt)):
|
||||||
passwd_verification = getpass.getpass(prompt='And one more time for verification: ')
|
passwd_verification = getpass.getpass(prompt='And one more time for verification: ')
|
||||||
if passwd != passwd_verification:
|
if passwd != passwd_verification:
|
||||||
log(' * Passwords did not match * ', bg='black', fg='red')
|
log(' * Passwords did not match * ', fg='red')
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if len(passwd.strip()) <= 0:
|
if len(passwd.strip()) <= 0:
|
||||||
|
|
@ -54,7 +54,7 @@ def ask_for_superuser_account(prompt='Create a required super-user with sudo pri
|
||||||
if not new_user and forced:
|
if not new_user and forced:
|
||||||
# TODO: make this text more generic?
|
# TODO: make this text more generic?
|
||||||
# It's only used to create the first sudo user when root is disabled in guided.py
|
# It's only used to create the first sudo user when root is disabled in guided.py
|
||||||
log(' * Since root is disabled, you need to create a least one (super) user!', bg='black', fg='red')
|
log(' * Since root is disabled, you need to create a least one (super) user!', fg='red')
|
||||||
continue
|
continue
|
||||||
elif not new_user and not forced:
|
elif not new_user and not forced:
|
||||||
raise UserError("No superuser was created.")
|
raise UserError("No superuser was created.")
|
||||||
|
|
@ -108,7 +108,6 @@ def ask_to_configure_network():
|
||||||
log(
|
log(
|
||||||
"You need to enter a valid IP in IP-config mode.",
|
"You need to enter a valid IP in IP-config mode.",
|
||||||
level=LOG_LEVELS.Warning,
|
level=LOG_LEVELS.Warning,
|
||||||
bg='black',
|
|
||||||
fg='red'
|
fg='red'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -176,7 +176,6 @@ def ask_user_questions():
|
||||||
if not imported._prep_function():
|
if not imported._prep_function():
|
||||||
archinstall.log(
|
archinstall.log(
|
||||||
' * Profile\'s preparation requirements was not fulfilled.',
|
' * Profile\'s preparation requirements was not fulfilled.',
|
||||||
bg='black',
|
|
||||||
fg='red'
|
fg='red'
|
||||||
)
|
)
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue