git://git.onelab.eu
/
bootmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get nodeimage kernel version using nodeimage rpm via chroot; this avoids rpm-db versi...
[bootmanager.git]
/
source
/
steps
/
ValidateNodeInstall.py
diff --git
a/source/steps/ValidateNodeInstall.py
b/source/steps/ValidateNodeInstall.py
index
5f63598
..
2ca2b7a
100644
(file)
--- a/
source/steps/ValidateNodeInstall.py
+++ b/
source/steps/ValidateNodeInstall.py
@@
-137,7
+137,8
@@
def Run( vars, log ):
# these 2 links are created by our kernel's post-install scriplet
log.write("Checking for a custom kernel\n")
try:
# these 2 links are created by our kernel's post-install scriplet
log.write("Checking for a custom kernel\n")
try:
- kversion = os.popen('rpm -r /tmp/mnt/sysimg -qa kernel | tail -1 | cut -c 8-').read().rstrip()
+ # Use chroot to call rpm, b/c the bootimage&nodeimage rpm-versions may not work together
+ kversion = os.popen("chroot %s rpm -qa kernel | tail -1 | cut -c 8-" % SYSIMG_PATH).read().rstrip()
os.stat("%s/boot/vmlinuz-%s" % (SYSIMG_PATH,kversion))
except OSError, e:
log.write( "Couldn't locate base kernel (you might be using the stock kernel).\n")
os.stat("%s/boot/vmlinuz-%s" % (SYSIMG_PATH,kversion))
except OSError, e:
log.write( "Couldn't locate base kernel (you might be using the stock kernel).\n")