From 2e76571004ff3b3b9f5dd04dbda9c14382cb4536 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Fri, 27 May 2011 12:53:53 -0400 Subject: [PATCH] Revert "move agent start script to upstart, to resolve the issue that agent sometimes starts before network in up state" This reverts commit 1a2ba7eeee69f9b0a789a787383cf429e9d4c11c. --- agent/distro/ubuntu/SYSCONFDIR/init/cloud-agent.conf | 10 ---------- debian/cloud-agent.install | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 agent/distro/ubuntu/SYSCONFDIR/init/cloud-agent.conf diff --git a/agent/distro/ubuntu/SYSCONFDIR/init/cloud-agent.conf b/agent/distro/ubuntu/SYSCONFDIR/init/cloud-agent.conf deleted file mode 100644 index 8edb8400983..00000000000 --- a/agent/distro/ubuntu/SYSCONFDIR/init/cloud-agent.conf +++ /dev/null @@ -1,10 +0,0 @@ -description "cloudstack agent daemon" -author "Edison Su" - -start on (net-device-up IFACE=cloudbr0) -stop on runlevel [!2345] - -expect fork - -exec /usr/bin/cloud-daemonize -n "cloud-agent" -p /var/run/cloud-agent.pid -l /var/log/cloud/agent/agent.log /usr/bin/agent-runner - diff --git a/debian/cloud-agent.install b/debian/cloud-agent.install index e2201dfcd7a..5a053116690 100644 --- a/debian/cloud-agent.install +++ b/debian/cloud-agent.install @@ -2,7 +2,7 @@ /etc/cloud/agent/developer.properties.template /etc/cloud/agent/environment.properties /etc/cloud/agent/log4j-cloud.xml -/etc/init/cloud-agent.conf +/etc/init.d/cloud-agent /usr/bin/agent-runner /usr/bin/cloud-setup-agent /usr/lib/cloud/agent/css