Skip to content

Commit 16ad648

Browse files
committed
incorporate review comments
Signed-off-by: Mayank Singh <mayankfz@gmail.com>
1 parent 3d7596f commit 16ad648

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

init/acl/waagent.service

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ Description=Microsoft Azure Linux Agent (ACL)
33
Wants=network-online.target sshd.service sshd-keygen.service
44
After=network-online.target sshd-keygen.service systemd-sysext.service
55

6+
ConditionFileIsExecutable=/usr/bin/waagent
7+
ConditionPathExists=/etc/waagent.conf
8+
69
[Service]
710
Type=simple
811

9-
Environment=PYTHONUNBUFFERED=x
10-
ExecStart=/usr/bin/waagent -daemon
12+
ExecStart=/usr/bin/python -u /usr/bin/waagent -daemon
1113

1214
Restart=always
1315
RestartSec=5s

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def get_data_files(name, version, fullname): # pylint: disable=R0912
167167
elif name in ["mariner", "azurelinux"]:
168168
set_bin_files(data_files, dest=agent_bin_path)
169169
set_logrotate_files(data_files)
170-
if fullname == "Microsoft Azure Container Linux":
170+
if "azure container linux" in fullname.lower():
171171
set_conf_files(data_files, dest="/etc",
172172
src=["config/acl/waagent.conf"])
173173
set_systemd_files(data_files, dest=systemd_dir_path,

0 commit comments

Comments
 (0)