Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[hostcfgd] Fix Boolean String Evaluation #5248

Merged
merged 2 commits into from
Aug 27, 2020
Merged

[hostcfgd] Fix Boolean String Evaluation #5248

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2ad9c9
[hostcfgd] Fix Boolean String Evaluation
tahmed-dev Aug 25, 2020
ed7f56f
do not enable .service systemd unit if it has timer associated and
tahmed-dev Aug 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions files/image_config/hostcfgd/hostcfgd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/python -u
# -*- coding: utf-8 -*-

import ast
import os
import sys
import subprocess
Expand Down Expand Up @@ -41,15 +42,15 @@ def obfuscate(data):
return data


def update_feature_state(feature_name, state, has_timer=False):
feature_suffixes = ["service"] + (["timer"] if has_timer else [])
def update_feature_state(feature_name, state, has_timer):
feature_suffixes = ["service"] + (["timer"] if ast.literal_eval(has_timer) else [])
if state == "enabled":
start_cmds = []
for suffix in feature_suffixes:
start_cmds.append("sudo systemctl unmask {}.{}".format(feature_name, suffix))
start_cmds.append("sudo systemctl enable {}.{}".format(feature_name, suffix))
# If feature has timer associated with it, start corresponding systemd .timer unit
# otherwise, start corresponding systemd .service unit
# If feature has timer associated with it, start/enable corresponding systemd .timer unit
# otherwise, start/enable corresponding systemd .service unit
start_cmds.append("sudo systemctl enable {}.{}".format(feature_name, feature_suffixes[-1]))
tahmed-dev marked this conversation as resolved.
Show resolved Hide resolved
start_cmds.append("sudo systemctl start {}.{}".format(feature_name, feature_suffixes[-1]))
for cmd in start_cmds:
syslog.syslog(syslog.LOG_INFO, "Running cmd: '{}'".format(cmd))
Expand Down