Merge remote branch 'cros/upstream' into master.

client/bin/harness_standalone.py

 """The standalone harness interface
 
 The default interface as required for the standalone reboot helper.
 """
 
 __author__ = """Copyright Andy Whitcroft 2007"""
 
 from autotest_lib.client.common_lib import utils
 import os, harness, shutil, logging
 
 class harness_standalone(harness.harness):
     """The standalone server harness
 
     Properties:
             job
                     The job object for this job
     """
 
-    def __init__(self, job):
+    def __init__(self, job, harness_args):
         """
                 job
                         The job object for this job
         """
         self.autodir = os.path.abspath(os.environ['AUTODIR'])
         self.setup(job)
 
         src = job.control_get()
         dest = os.path.join(self.autodir, 'control')
         if os.path.abspath(src) != os.path.abspath(dest):
@@ skipping 10 matching lines @@
             initdefault = utils.system_output('grep :initdefault: /etc/inittab')
             initdefault = initdefault.split(':')[1]
         else:
             initdefault = '2'
 
         try:
             utils.system('ln -sf %s /etc/init.d/autotest' % rc)
             utils.system('ln -sf %s /etc/rc%s.d/S99autotest' % (rc,initdefault))
         except:
             logging.warning("Linking init scripts failed")