diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-09-30 22:01:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-30 22:01:28 +0200 |
| commit | ebf27d5fb3d9203256d2cd49e0f4cf810bae03b1 (patch) | |
| tree | af717004df2568f1d713fa0f808fe894de30ed06 | |
| parent | 83882a3c80154cab44a6f8a3e8f9ff17f2227a15 (diff) | |
| parent | defc29ef4d42224fbea591fc2909d83e7904c20e (diff) | |
| download | vyos-1x-ebf27d5fb3d9203256d2cd49e0f4cf810bae03b1.tar.gz vyos-1x-ebf27d5fb3d9203256d2cd49e0f4cf810bae03b1.zip | |
Merge pull request #4763 from c-po/config-boot-motd
boot-config-loader: T7889: Inform user during login of config-load issues
| -rwxr-xr-x | src/helpers/vyos-boot-config-loader.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/helpers/vyos-boot-config-loader.py b/src/helpers/vyos-boot-config-loader.py index e20b8415f..9826a6d3e 100755 --- a/src/helpers/vyos-boot-config-loader.py +++ b/src/helpers/vyos-boot-config-loader.py @@ -13,8 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# import os import sys @@ -23,10 +21,13 @@ import grp import traceback from datetime import datetime -from vyos.defaults import directories, config_status -from vyos.configsession import ConfigSession, ConfigSessionError +from vyos.defaults import directories +from vyos.defaults import config_status +from vyos.configsession import ConfigSession +from vyos.configsession import ConfigSessionError from vyos.configtree import ConfigTree from vyos.utils.process import cmd +from vyos.utils.file import write_file STATUS_FILE = config_status TRACE_FILE = '/tmp/boot-config-trace' @@ -68,16 +69,16 @@ def trace_to_file(trace_file_name): print('{0}'.format(e)) def failsafe(config_file_name): - fail_msg = """ + fail_msg = f""" !!!!! There were errors loading the configuration - Please examine the errors in - {0} - and correct + Please examine the errors in: + {TRACE_FILE} !!!!! - """.format(TRACE_FILE) + """ print(fail_msg, file=sys.stderr) + write_file('/run/motd.d/9999-boot-config-error', fail_msg) users = [x[0] for x in pwd.getpwall()] if 'vyos' in users: |