From 587da2e9081ef4ce7bc049d4de91ff0368d01721 Mon Sep 17 00:00:00 2001
From: Yue Zhang <yuezha@microsoft.com>
Date: Tue, 30 Jun 2015 17:08:43 +0800
Subject: [PATCH] Add post install script

---
 azurelinuxagent/agent.py | 16 +++++++++++++---
 bin/register-service     |  1 +
 setup.py                 |  6 ++----
 3 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 bin/register-service

diff --git a/azurelinuxagent/agent.py b/azurelinuxagent/agent.py
index c68582539..96df5f53d 100644
--- a/azurelinuxagent/agent.py
+++ b/azurelinuxagent/agent.py
@@ -26,7 +26,7 @@ import traceback
 import threading
 import subprocess
 import azurelinuxagent.logger as logger
-from azurelinuxagent.metadata import GuestAgentLongVersion, \
+from azurelinuxagent.metadata import GuestAgentName, GuestAgentLongVersion, \
                                      DistroName, DistroVersion, DistroFullName
 from azurelinuxagent.utils.osutil import OSUtil
 from azurelinuxagent.handler import Handlers
@@ -56,6 +56,8 @@ def ParseArgs(sysArgv):
             cmd = "daemon"
         elif re.match("^([-/]*)start", a):
             cmd = "start"
+        elif re.match("^([-/]*)register-service", a):
+            cmd = "register-service"
         elif re.match("^([-/]*)version", a):
             cmd = "version"
         elif re.match("^([-/]*)verbose", a):
@@ -74,8 +76,8 @@ def Version():
                                           DistroVersion))
 def Usage():
     print("")
-    print(("usage: {0} [-verbose] [-force] "
-           "[-help|-deprovision[+user]|-version|-daemon|-start]"
+    print(("usage: {0} [-verbose] [-force] [-help]"
+           "-deprovision[+user]|-register-service|-version|-daemon|-start]"
            "").format(sys.argv[0]))
     print("")
 
@@ -83,6 +85,12 @@ def Start():
     devnull = open(os.devnull, 'w')
     subprocess.Popen([sys.argv[0], '-daemon'], stdout=devnull, stderr=devnull)
 
+def RegisterService():
+    print "Register {0} service".format(GuestAgentName)
+    OSUtil.RegisterAgentService()
+    print "Start {0} service".format(GuestAgentName)
+    OSUtil.StartAgentService()
+
 def Main():
     command, force, verbose = ParseArgs(sys.argv[1:])
     if command == "version":
@@ -97,5 +105,7 @@ def Main():
             Deprovision(force, deluser=False)
         elif command == "start":
             Start()
+        elif command == "register-service":
+            RegisterService()
         elif command == "daemon":
             Run()
diff --git a/bin/register-service b/bin/register-service
new file mode 100644
index 000000000..d5155890a
--- /dev/null
+++ b/bin/register-service
@@ -0,0 +1 @@
+waagent register-service
diff --git a/setup.py b/setup.py
index f0753a09f..dbb456e93 100755
--- a/setup.py
+++ b/setup.py
@@ -23,6 +23,7 @@ from azurelinuxagent.metadata import GuestAgentName, GuestAgentVersion, \
                                      DistroName, DistroVersion, DistroFullName
 
 from azurelinuxagent.utils.osutil import OSUtil
+import azurelinuxagent.agent as agent
 import setuptools
 from setuptools import find_packages
 from setuptools.command.install import install as  _install
@@ -117,10 +118,7 @@ class install(_install):
     def run(self):
         _install.run(self)
         if self.register_service:
-            print "Register agent service"
-            OSUtil.RegisterAgentService()
-            print "Start agent service"
-            OSUtil.StartAgentService()
+            agent.RegisterService()
 
 setuptools.setup(name=GuestAgentName,
                  version=GuestAgentVersion,