ABAT: handle even obscurer SLES root specifier
It seems that in SLES images root will be shown mounted on /dev/root
but that /dev/root will not even exist. At this point we have use
the mtab to determine where / is mounted from. Use df -lP to find
the underlying device for passing to the boot loader.
Signed-off-by: Andy Whitcroft <[email protected]>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@734 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/bin/harness_ABAT.py b/client/bin/harness_ABAT.py
index 6d2273a..e495dd0 100755
--- a/client/bin/harness_ABAT.py
+++ b/client/bin/harness_ABAT.py
@@ -71,16 +71,17 @@
def __root_device(self):
- fd = open("/proc/mounts", "r")
- try:
- for line in fd.readlines():
- words = line.split(' ')
- if words[0] != 'rootfs' and words[1] == '/':
- return os.path.realpath(words[0])
- return None
- finally:
- fd.close()
+ device = None
+ root = re.compile(r'^\S*(/dev/\S+).*\s/\s*$')
+ df = system_output('df -lP')
+ for line in df.split("\n"):
+ m = root.match(line)
+ if m:
+ device = m.groups()[0]
+
+ return device
+
def run_start(self):
"""A run within this job is starting"""
