X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fenvs%2Fguest-setup0.sh;h=fb3133b9ffb50dc7f4c95daf51ab56959178a798;hb=868367c47df84a70a49f7be6b5e6c3150906aa8f;hp=4f9eaa430f5f27e79bcaf77f527d79efe68b63b4;hpb=42e2343970d47d0aa081a565c0f51873778e555c;p=kvmfornfv.git

diff --git a/ci/envs/guest-setup0.sh b/ci/envs/guest-setup0.sh
index 4f9eaa430..fb3133b9f 100755
--- a/ci/envs/guest-setup0.sh
+++ b/ci/envs/guest-setup0.sh
@@ -8,9 +8,15 @@
 ## http://www.apache.org/licenses/LICENSE-2.0
 ###############################################################################
 
+source utils.sh
 
+KERNEL_VERSION=$( getKernelVersion )
+if [ -z $KERNEL_VERSION ];then
+   echo "Kernel RPM not found"
+   exit 1
+fi
 rpmdir=${1:-"/root/workspace/rpm"}
-rpmpat="kernel-4.4*.rpm"
+rpmpat="kernel-${KERNEL_VERSION}*.rpm"
 guest_isolcpus=1
 
 # The script's caller should passing the rpm directory that is built out from
@@ -58,5 +64,6 @@ config_grub 'idle' 'poll'
 ## Disable clocksource verification at runtime
 config_grub 'tsc' 'reliable'
 
-grub2-mkconfig -o /boot/grub2/grub.cfg
+sed -ie 's/saved/0/g' /etc/default/grub
 install_kernel
+grub2-mkconfig -o /boot/grub2/grub.cfg