Fix cml.service not waiting for process shutdown (#160)

Author: 0x2b3bfa0

iterative/resource_runner.go

@@ -327,15 +327,14 @@ sudo chmod +x /usr/bin/cml.sh
 
 sudo bash -c 'cat << EOF > /etc/systemd/system/cml.service
 [Unit]
-  Description=cml service
+  After=default.target
 
 [Service]
-  Type=oneshot
-  RemainAfterExit=yes
+  Type=simple
   ExecStart=/usr/bin/cml.sh
 
 [Install]
-  WantedBy=multi-user.target
+  WantedBy=default.target
 EOF'
 
 {{if .cloud}}

iterative/testdata/script_template_cloud_aws.golden

@@ -66,15 +66,14 @@ sudo chmod +x /usr/bin/cml.sh
 
 sudo bash -c 'cat << EOF > /etc/systemd/system/cml.service
 [Unit]
-  Description=cml service
+  After=default.target
 
 [Service]
-  Type=oneshot
-  RemainAfterExit=yes
+  Type=simple
   ExecStart=/usr/bin/cml.sh
 
 [Install]
-  WantedBy=multi-user.target
+  WantedBy=default.target
 EOF'
 
 

iterative/testdata/script_template_cloud_azure.golden

@@ -67,15 +67,14 @@ sudo chmod +x /usr/bin/cml.sh
 
 sudo bash -c 'cat << EOF > /etc/systemd/system/cml.service
 [Unit]
-  Description=cml service
+  After=default.target
 
 [Service]
-  Type=oneshot
-  RemainAfterExit=yes
+  Type=simple
   ExecStart=/usr/bin/cml.sh
 
 [Install]
-  WantedBy=multi-user.target
+  WantedBy=default.target
 EOF'
 
 

iterative/testdata/script_template_cloud_invalid.golden

@@ -62,15 +62,14 @@ sudo chmod +x /usr/bin/cml.sh
 
 sudo bash -c 'cat << EOF > /etc/systemd/system/cml.service
 [Unit]
-  Description=cml service
+  After=default.target
 
 [Service]
-  Type=oneshot
-  RemainAfterExit=yes
+  Type=simple
   ExecStart=/usr/bin/cml.sh
 
 [Install]
-  WantedBy=multi-user.target
+  WantedBy=default.target
 EOF'