diff options
Diffstat (limited to 'meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py')
-rw-r--r-- | meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py b/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py index 7bc807d2bc..c3a98979c5 100644 --- a/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py +++ b/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py | |||
@@ -19,10 +19,9 @@ import subprocess | |||
19 | import sys | 19 | import sys |
20 | import pexpect | 20 | import pexpect |
21 | 21 | ||
22 | import oeqa.utils.sshcontrol as sshcontrol | 22 | from oeqa.controllers.controllerimage import ControllerImageHardwareTarget |
23 | from oeqa.controllers.masterimage import MasterImageHardwareTarget | ||
24 | 23 | ||
25 | class GrubTarget(MasterImageHardwareTarget): | 24 | class GrubTarget(ControllerImageHardwareTarget): |
26 | 25 | ||
27 | def __init__(self, d): | 26 | def __init__(self, d): |
28 | super(GrubTarget, self).__init__(d) | 27 | super(GrubTarget, self).__init__(d) |
@@ -41,16 +40,16 @@ class GrubTarget(MasterImageHardwareTarget): | |||
41 | 40 | ||
42 | def _deploy(self): | 41 | def _deploy(self): |
43 | # make sure these aren't mounted | 42 | # make sure these aren't mounted |
44 | self.master.run("umount /boot; umount /mnt/testrootfs;") | 43 | self.controller.run("umount /boot; umount /mnt/testrootfs;") |
45 | self.master.ignore_status = False | 44 | self.controller.ignore_status = False |
46 | # Kernel files may not be in the image, so copy them just in case | 45 | # Kernel files may not be in the image, so copy them just in case |
47 | self.master.copy_to(self.rootfs, "~/test-rootfs." + self.image_fstype) | 46 | self.controller.copy_to(self.rootfs, "~/test-rootfs." + self.image_fstype) |
48 | self.master.copy_to(self.kernel, "~/test-kernel") | 47 | self.controller.copy_to(self.kernel, "~/test-kernel") |
49 | for cmd in self.deploy_cmds: | 48 | for cmd in self.deploy_cmds: |
50 | self.master.run(cmd) | 49 | self.controller.run(cmd) |
51 | 50 | ||
52 | def _start(self, params=None): | 51 | def _start(self, params=None): |
53 | self.power_cycle(self.master) | 52 | self.power_cycle(self.controller) |
54 | try: | 53 | try: |
55 | serialconn = pexpect.spawn(self.serialcontrol_cmd, env=self.origenv, logfile=sys.stdout) | 54 | serialconn = pexpect.spawn(self.serialcontrol_cmd, env=self.origenv, logfile=sys.stdout) |
56 | serialconn.expect("GNU GRUB version 2.00") | 55 | serialconn.expect("GNU GRUB version 2.00") |