From: Anthony PERARD <anthony.perard@citrix.com>
Date: Thu, 15 Sep 2016 15:58:04 +0000 (+0000)
Subject: image: fix grub config
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1f96a45f7120ab9a9b6b8b4ae15a79b4a2481e41;p=openstack%2Fci-loop-config.git

image: fix grub config
---

diff --git a/nodepool/scripts/prepare_node_devstack_xen.sh b/nodepool/scripts/prepare_node_devstack_xen.sh
index 0dd54c0..f03e1ab 100755
--- a/nodepool/scripts/prepare_node_devstack_xen.sh
+++ b/nodepool/scripts/prepare_node_devstack_xen.sh
@@ -6,6 +6,8 @@ set -xe
 # Install Xen and update the kernel
 sudo apt-get -y install htop vim git pwgen xen-hypervisor-4.4
 
+# This change is now probably useless...
+# because grub.d/50-cloudimg-settings.cfg exist
 sudo mv /etc/default/grub{,.bak}
 sudo tee /etc/default/grub << EOC
 GRUB_DEFAULT=0
@@ -17,6 +19,18 @@ GRUB_TERMINAL=console
 GRUB_DISABLE_LINUX_UUID="false"
 EOC
 
+# Override any overriden value
+sudo tee /etc/default/grub.d/99_balloons.cfg << EOC
+GRUB_DEFAULT=0
+GRUB_TIMEOUT=30
+GRUB_CMDLINE_LINUX_DEFAULT="debug loglevel=7"
+GRUB_CMDLINE_LINUX=""
+GRUB_TERMINAL=console
+GRUB_DISABLE_LINUX_UUID=false
+GRUB_HIDDEN_TIMEOUT=0
+GRUB_HIDDEN_TIMEOUT_QUIET=false
+EOC
+
 sudo mv /etc/default/grub.d/xen.cfg{,.bak}
 sudo tee /etc/default/grub.d/xen.cfg << EOC
 echo "Including Xen overrides from /etc/default/grub.d/xen.cfg"