Merge "This patch includes host and guest configuration script updates to install...

diff --git a/ci/envs/guest-setup0.sh b/ci/envs/guest-setup0.sh
index 301d34c..fb3133b 100755 (executable)
--- 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 0778aae..1bd7f12 100755 (executable)
--- 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