correct scvmm references. fixes Azure#185

hglkrijger · May 27, 2016 · 2570210 · 2570210
1 parent b05e389
commit 2570210
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/azurelinuxagent/distro/default/daemon.py b/azurelinuxagent/distro/default/daemon.py
@@ -79,7 +79,7 @@ def daemon(self):
             os.chdir(conf.get_lib_dir())
 
         if conf.get_detect_scvmm_env():
-            if self.distro.scvmm_handler.run():
+            if self.distro.scvmm_handler.detect_scvmm_env():
                 return
 
         self.distro.provision_handler.run()

diff --git a/azurelinuxagent/distro/default/scvmm.py b/azurelinuxagent/distro/default/scvmm.py
@@ -20,6 +20,7 @@
 import os
 import subprocess
 import azurelinuxagent.logger as logger
+import azurelinuxagent.conf as conf
 
 VMM_CONF_FILE_NAME = "linuxosconfiguration.xml"
 VMM_STARTUP_SCRIPT_NAME= "install"
@@ -31,7 +32,7 @@ def __init__(self, distro):
     def detect_scvmm_env(self):
         logger.info("Detecting Microsoft System Center VMM Environment")
         self.distro.osutil.mount_dvd(max_retry=1, chk_err=False)
-        mount_point = self.distro.osutil.get_dvd_mount_point()
+        mount_point = conf.get_dvd_mount_point()
         found = os.path.isfile(os.path.join(mount_point, VMM_CONF_FILE_NAME))
         if found:
             self.start_scvmm_agent()
@@ -42,7 +43,7 @@ def detect_scvmm_env(self):
     def start_scvmm_agent(self):
         logger.info("Starting Microsoft System Center VMM Initialization "
                     "Process")
-        mount_point = self.distro.osutil.get_dvd_mount_point()
+        mount_point = conf.get_dvd_mount_point()
         startup_script = os.path.join(mount_point, VMM_STARTUP_SCRIPT_NAME)
         subprocess.Popen(["/bin/bash", startup_script, "-p " + mount_point])