Catching shlex splitting error in fact gathering get_cmdline call

Fixes #8352
pull/8347/merge
James Cammarata 10 years ago
parent 80df2135e9
commit 7a5076c8b8

@ -327,12 +327,15 @@ class Facts(object):
data = get_file_content('/proc/cmdline') data = get_file_content('/proc/cmdline')
if data: if data:
self.facts['cmdline'] = {} self.facts['cmdline'] = {}
try:
for piece in shlex.split(data): for piece in shlex.split(data):
item = piece.split('=', 1) item = piece.split('=', 1)
if len(item) == 1: if len(item) == 1:
self.facts['cmdline'][item[0]] = True self.facts['cmdline'][item[0]] = True
else: else:
self.facts['cmdline'][item[0]] = item[1] self.facts['cmdline'][item[0]] = item[1]
except ValueError, e:
pass
def get_public_ssh_host_keys(self): def get_public_ssh_host_keys(self):
dsa_filename = '/etc/ssh/ssh_host_dsa_key.pub' dsa_filename = '/etc/ssh/ssh_host_dsa_key.pub'

Loading…
Cancel
Save