X-Git-Url: http://git.onelab.eu/?p=pcucontrol.git;a=blobdiff_plain;f=pcucontrol%2Freboot.py;fp=pcucontrol%2Freboot.py;h=c127ac083c31e6159875aece3e56cdc90c8f6ffb;hp=eef8d2e2ea094122e00790d60b1622304f948d57;hb=b0f9cc9ead4e2fec119199ec942165f2cefbe060;hpb=69aa221b1ae2926c895187fc2473ce4898ae892b diff --git a/pcucontrol/reboot.py b/pcucontrol/reboot.py index eef8d2e..c127ac0 100755 --- a/pcucontrol/reboot.py +++ b/pcucontrol/reboot.py @@ -359,9 +359,14 @@ class BasicPCUControl(PCUModel): def run_expect_script(self, scriptname, **args): locfg = command.CMD() + if 'ip' in args: + host = self.ip + else: + host = self.host + cmd_str = get_python_lib(1) + "/pcucontrol/models/exp/" cmd = cmd_str + "%s %s %s '%s' %s %s " % ( - scriptname, self.host, self.username, + scriptname, host, self.username, self.password, args['dryrun'], args['model']) print cmd cmd_out, cmd_err = locfg.run_noexcept(cmd)