From 8149b73f6b97c2cccba6677bbeb42e1850c8dedb Mon Sep 17 00:00:00 2001
From: Yue Zhang <yuezha@microsoft.com>
Date: Tue, 30 Jun 2015 00:14:17 +0800
Subject: [PATCH] Add register service option to setup.py install

---
 azurelinuxagent/distro/default/run.py | 2 +-
 azurelinuxagent/distro/suse/osutil.py | 7 +++++++
 setup.py                              | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/azurelinuxagent/distro/default/run.py b/azurelinuxagent/distro/default/run.py
index 2b3cf1a..e92a9f0 100644
--- a/azurelinuxagent/distro/default/run.py
+++ b/azurelinuxagent/distro/default/run.py
@@ -73,7 +73,7 @@ class RunHandler(object):
             try:
                 protocol.reportStatus(vmStatus)
             except prot.ProtocolError as e:
-                logger.Error("Failed to report vm status: {0}", status)
+                logger.Error("Failed to report vm status: {0}", e)
 
             time.sleep(25)
 
diff --git a/azurelinuxagent/distro/suse/osutil.py b/azurelinuxagent/distro/suse/osutil.py
index 731fa1d..c47c52a 100644
--- a/azurelinuxagent/distro/suse/osutil.py
+++ b/azurelinuxagent/distro/suse/osutil.py
@@ -79,3 +79,10 @@ class SUSEOSUtil(SUSE11OSUtil):
         super(SUSEOSUtil, self).__init__()
         self.dhcpClientName = 'wickedd-dhcp4'
 
+    def RegisterAgentService(self):
+        return shellutil.Run("systemctl enable waagent", chk_err=False)
+    
+    def UnregisterAgentService(self):
+        return shellutil.Run("systemctl disable waagent", chk_err=False)
+
+
diff --git a/setup.py b/setup.py
index 7b4db9e..71b25a4 100755
--- a/setup.py
+++ b/setup.py
@@ -115,6 +115,8 @@ class install(_install):
         if self.register_service:
             print "Register agent service"
             OSUtil.RegisterAgentService()
+            print "Start agent service"
+            OSUtil.StartAgentService()
 
 setuptools.setup(name=GuestAgentName,
                  version=GuestAgentVersion,