]> xenbits.xensource.com Git - openstack/ci-loop-config.git/commitdiff
image: fix grub config
authorAnthony PERARD <anthony.perard@citrix.com>
Thu, 15 Sep 2016 15:58:04 +0000 (15:58 +0000)
committerAnthony PERARD <anthony.perard@citrix.com>
Wed, 2 Nov 2016 17:54:21 +0000 (17:54 +0000)
nodepool/scripts/prepare_node_devstack_xen.sh

index 0dd54c05e7eb9992f8b36aa185aab99384075a57..f03e1ab63435c03951aca60dedde7c1ff8d39fc2 100755 (executable)
@@ -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"