diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-22 17:00:50 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-22 17:00:50 -0400 |
| commit | c0c45eba28e623751d71a7fa3cb27c87300b851e (patch) | |
| tree | 67fbb66105b1b81fa92240c59543962d716087e3 /systemd | |
| parent | c13f800d19884a28c57745f692d1b5221c6c3a6c (diff) | |
| parent | 40a2f621b05c11ed6397a1735b6bfff0ea07b097 (diff) | |
| download | vyos-cloud-init-c0c45eba28e623751d71a7fa3cb27c87300b851e.tar.gz vyos-cloud-init-c0c45eba28e623751d71a7fa3cb27c87300b851e.zip | |
merge from master at 0.7.7-17-g40a2f62
Diffstat (limited to 'systemd')
| -rwxr-xr-x | systemd/cloud-init-generator | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/systemd/cloud-init-generator b/systemd/cloud-init-generator index 2d319695..fedb6309 100755 --- a/systemd/cloud-init-generator +++ b/systemd/cloud-init-generator @@ -6,6 +6,7 @@ DEBUG_LEVEL=1 LOG_D="/run/cloud-init" ENABLE="enabled" DISABLE="disabled" +RUN_ENABLED_FILE="$LOG_D/$ENABLE" CLOUD_SYSTEM_TARGET="/lib/systemd/system/cloud-init.target" CLOUD_TARGET_NAME="cloud-init.target" # lxc sets 'container', but lets make that explicitly a global @@ -107,6 +108,7 @@ main() { "ln $CLOUD_SYSTEM_TARGET $link_path" fi fi + : > "$RUN_ENABLED_FILE" elif [ "$result" = "$DISABLE" ]; then if [ -f "$link_path" ]; then if rm -f "$link_path"; then @@ -118,6 +120,9 @@ main() { else debug 1 "already disabled: no change needed [no $link_path]" fi + if [ -e "$RUN_ENABLED_FILE" ]; then + rm -f "$RUN_ENABLED_FILE" + fi else debug 0 "unexpected result '$result'" ret=3 |