1 files changed, 4 insertions, 3 deletions
diff --git a/setup.py b/setup.py
index 0f6230e..c799787 100755
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ from azurelinuxagent.metadata import AGENT_NAME, AGENT_VERSION, \
                                      AGENT_DESCRIPTION, \
                                      DISTRO_NAME, DISTRO_VERSION, DISTRO_FULL_NAME
 
-import azurelinuxagent.agent as agent
+from azurelinuxagent.agent import Agent
 import setuptools
 from setuptools import find_packages
 from setuptools.command.install import install as  _install
@@ -72,7 +72,8 @@ def get_data_files(name, version, fullname):
 
     elif name == 'coreos':
         set_bin_files(data_files, dest="/usr/share/oem/bin")
-        set_conf_files(data_files, dest="/usr/share/oem")
+        set_conf_files(data_files, dest="/usr/share/oem", 
+                       src=["config/coreos/waagent.conf"])
         set_logrotate_files(data_files)
         set_files(data_files, dest="/usr/share/oem", 
                   src="init/coreos/cloud-config.yml")
@@ -149,7 +150,7 @@ class install(_install):
     def run(self):
         _install.run(self)
         if self.register_service:
-            agent.register_service()
+            Agent(False).register_service()
 
 setuptools.setup(name=AGENT_NAME,
                  version=AGENT_VERSION,