From 6ab57b8669c9d9285939ccda786a302431f87121 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 28 Aug 2020 09:38:10 -0400 Subject: [PATCH] Add a friendlier message if tftp service is running The socket activation may fail due to tftp already running. --- confluent_server/bin/osdeploy | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/confluent_server/bin/osdeploy b/confluent_server/bin/osdeploy index 05238f89..14b4c09f 100644 --- a/confluent_server/bin/osdeploy +++ b/confluent_server/bin/osdeploy @@ -160,7 +160,11 @@ def install_tftp_content(): emprint('Unable to detect a directory for tftp content (check that tftp server is installed)') return 1 if os.path.exists('/usr/lib/systemd/system/tftp.socket'): - subprocess.check_call(['systemctl', 'enable', 'tftp.socket', '--now']) + try: + subprocess.check_call(['systemctl', 'enable', 'tftp.socket', '--now']) + print('Ensured that tftp servicec is enabled') + except Exception: + emprint('Unable to automatically enable and start tftp.socket, tftp server may already be running outside of systemd control') else: emprint( 'Detected {0} as tftp directory, but unable to determine tftp service, ensure that a tftp server is installed and enabled manually'.format(tftplocation))