From f59f778f052ded477b408d8e076b66fd76832cf1 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 13 Jun 2018 13:20:06 +0200 Subject: [PATCH] rc: clarify that installer is for installing when SSH is off It's only an issue with config imports in live mode. Not sure why this wasn't shared text before. --- src/etc/rc.subr.d/livemode | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/etc/rc.subr.d/livemode b/src/etc/rc.subr.d/livemode index 211c77e6c..0791e48ec 100755 --- a/src/etc/rc.subr.d/livemode +++ b/src/etc/rc.subr.d/livemode @@ -58,13 +58,14 @@ if (is_install_media()) { echo "\n"; + $greeting = "Welcome! Both `root' and `installer' users are available for system\n"; + $greeting .= "setup or invoking the installer, respectively. The predefined root\n"; + $greeting .= "password works for both accounts."; + if (!isset($config['system']['ssh']['noauto']) && is_process_running('sshd')) { - echo "Welcome! Both `root' and `installer' users are available for system\n"; - echo "setup or invoking the installer, respectively. The predefined root\n"; - echo "password works for both accounts. Remote login via SSH is possible.\n"; - } else { - echo "Welcome! Both `root' and `installer' users are available for system\n"; - echo "setup. The predefined root password works for both accounts.\n"; + $greeting .= " Remote login via SSH is possible."; } + + echo $greeting . "\n"; } }