From: Jiang, Yunhong <yunhong.jiang@intel.com>
Date: Tue, 7 Mar 2017 08:10:06 +0000 (+0000)
Subject: Merge "This patch includes host and guest configuration script updates to install... 
X-Git-Tag: danube.1.0~8
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0c2f88aa2ccffc538c276caac88da6841107bf81;hp=b345dcdf3a6a7ebf19d2932e009f16fc3f51c84e;p=kvmfornfv.git

Merge "This patch includes host and guest configuration script updates to install kvmfornfv built kernel and configure the grub for executing test cases on latest installed kernel."
---

diff --git a/ci/envs/guest-setup0.sh b/ci/envs/guest-setup0.sh
index 301d34cbe..fb3133b9f 100755
--- a/ci/envs/guest-setup0.sh
+++ b/ci/envs/guest-setup0.sh
@@ -64,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
diff --git a/ci/envs/host-setup0.sh b/ci/envs/host-setup0.sh
index 0778aae96..1bd7f1205 100755
--- a/ci/envs/host-setup0.sh
+++ b/ci/envs/host-setup0.sh
@@ -76,6 +76,6 @@ config_grub 'idle' 'poll'
 ## Disable clocksource verification at runtime
 config_grub 'tsc' 'reliable'
 
-grub2-mkconfig -o /boot/grub2/grub.cfg
-
 install_kernel
+
+grub2-mkconfig -o /boot/grub2/grub.cfg