This is an automated email from the ASF dual-hosted git repository. bhaisaab pushed a commit to branch debian9-systemvmtemplate in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit d6896b7cce2504d082607cc5c027070dc5da753e Author: Wido den Hollander <w...@widodh.nl> AuthorDate: Thu Aug 10 14:36:52 2017 +0200 Move systemd services to /etc and enable services after they have been installed Signed-off-by: Wido den Hollander <w...@widodh.nl> --- .../configure_systemvm_services.sh | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh b/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh index f3bd52a..171c4b0 100644 --- a/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh +++ b/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh @@ -36,10 +36,10 @@ function install_cloud_scripts() { rsync -av ./cloud_scripts/ / chmod +x /opt/cloud/bin/* \ /root/{clearUsageRules.sh,reconfigLB.sh,monitorServices.py} \ - /etc/init.d/{cloud,cloud-early-config,cloud-passwd-srvr,postinit} \ + /etc/init.d/{cloud-early-config,cloud-passwd-srvr,postinit} \ /etc/profile.d/cloud.sh - cat > /lib/systemd/system/cloud-early-config.service << EOF + cat > /etc/systemd/system/cloud-early-config.service << EOF [Unit] Description=cloud-early-config: configure according to cmdline DefaultDependencies=no @@ -57,7 +57,7 @@ TimeoutStartSec=5min EOF - cat > /lib/systemd/system/cloud.service << EOF + cat > /etc/systemd/system/cloud.service << EOF [Unit] Description=cloud: startup cloud service After=cloud-early-config.service network.target local-fs.target @@ -66,14 +66,14 @@ After=cloud-early-config.service network.target local-fs.target WantedBy=multi-user.target [Service] -Type=forking -ExecStart=/etc/init.d/cloud start -ExecStop=/etc/init.d/cloud stop -RemainAfterExit=true -TimeoutStartSec=5min +Type=simple +WorkingDirectory=/usr/local/cloud/systemvm +ExecStart=/usr/local/cloud/systemvm/_run.sh +Restart=always +RestartSec=5 EOF - cat > /lib/systemd/system/cloud-passwd-srvr.service << EOF + cat > /etc/systemd/system/cloud-passwd-srvr.service << EOF [Unit] Description=cloud-passwd-srvr: cloud password server After=network.target local-fs.target @@ -89,7 +89,7 @@ RemainAfterExit=true TimeoutStartSec=5min EOF - cat > /lib/systemd/system/postinit.service << EOF + cat > /etc/systemd/system/postinit.service << EOF [Unit] Description=cloud post-init service After=cloud-early-config.service network.target local-fs.target @@ -107,8 +107,8 @@ EOF systemctl daemon-reload systemctl enable cloud-early-config - systemctl disable cloud-passwd-srvr - systemctl disable cloud + systemctl enable cloud-passwd-srvr + systemctl enable cloud } function do_signature() { -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" <commits@cloudstack.apache.org>.