From 63a0c69e76d6a12ac84b044674b4e1e1f2c75609 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Sat, 8 Oct 2016 13:23:45 -0700 Subject: [PATCH] modify grub only for ec2 --- baseimage/initializeBaseUbuntuImage.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/baseimage/initializeBaseUbuntuImage.sh b/baseimage/initializeBaseUbuntuImage.sh index 12a4a0195..9e16e912a 100644 --- a/baseimage/initializeBaseUbuntuImage.sh +++ b/baseimage/initializeBaseUbuntuImage.sh @@ -137,7 +137,7 @@ mkdir /etc/iptables && iptables-save > /etc/iptables/rules.v4 echo "=== Enable memory accounting ==" if [[ "${PROVIDER}" == "digitalocean" ]] || [[ "${PROVIDER}" == "caas" ]]; then sed -e 's/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX="console=tty1 root=LABEL=DOROOT notsc clocksource=kvm-clock net.ifnames=0 cgroup_enable=memory swapaccount=1 panic_on_oops=1 panic=5"/' -i /etc/default/grub -else +elif [[ "${PROVIDER}" == "ec2" ]]; then sed -e 's/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX="cgroup_enable=memory swapaccount=1 panic_on_oops=1 panic=5"/' -i /etc/default/grub fi update-grub