From 2ade557b3e49ca60585101b6977c93343a732a61 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 30 Jul 2020 15:20:53 -0400 Subject: [PATCH] Amend local osdeploy initialize behavior Do not bother the site cpio and correctly avoid duplicate config lines. --- confluent_server/bin/osdeploy | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/confluent_server/bin/osdeploy b/confluent_server/bin/osdeploy index 25ab3a65..760ab208 100644 --- a/confluent_server/bin/osdeploy +++ b/confluent_server/bin/osdeploy @@ -71,7 +71,7 @@ def local_node_trust_setup(): with open(certfile, 'w') as certout: certout.write(cert) with open('/etc/ssh/sshd_config', 'r') as sshconf: - currconfig = sshconf.read().split() + currconfig = sshconf.read().split('\n') for conline in currconfig: conline = conline.strip() neededlines.discard(conline) @@ -166,8 +166,9 @@ def initialize(cmdset): didsomething = True install_tftp_content() if cmdset.l: - didsomething = True local_node_trust_setup() + if not didsomething: + sys.exit(0) if not didsomething: sys.stderr.write('Nothing was done, use initialize -i for ' 'interactive mode, or see initialize -h for more options\n')