[gentoo-commits] proj/releng:master commit in: releases/weekly/scripts/

["Robin H. Johnson" <robbat2@gentoo.org>]

commit:     430eda0a519869fd59c7ac791e83e06af2a5e876
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 23:24:56 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 23:27:44 2016 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=430eda0a

cloud-prep: make grub accessible on serial console, just like the kernel.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 releases/weekly/scripts/cloud-prep.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/releases/weekly/scripts/cloud-prep.sh b/releases/weekly/scripts/cloud-prep.sh
index 20f3c5a..d1f98f3 100644
--- a/releases/weekly/scripts/cloud-prep.sh
+++ b/releases/weekly/scripts/cloud-prep.sh
@@ -16,9 +16,14 @@ grep -v rootfs /proc/mounts > /etc/mtab
 echo 'net.ipv4.conf.eth0.arp_notify = 1' >> /etc/sysctl.conf
 echo 'vm.swappiness = 0' >> /etc/sysctl.conf
 
-# Let's configure out grub
+# Let's configure our grub
+# Access on both regular tty and serial console
 mkdir /boot/grub
-echo 'GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8"' >> /etc/default/grub
+cat >>/etc/default/grub <<EOF
+GRUB_TERMINAL='serial console'
+GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8"
+GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1"
+EOF
 grub2-mkconfig -o /boot/grub/grub.cfg
 sed -r -i 's/loop[0-9]+p1/LABEL\=cloudimg-rootfs/g' /boot/grub/grub.cfg
 sed -i 's/root=.*\ ro/root=LABEL\=cloudimg-rootfs\ ro/' /boot/grub/grub.cfg