From 608de63d3ed4a365d6409007805d73d1f2ea909a Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Thu, 30 Jul 2015 09:57:49 +0200 Subject: [PATCH] Better grub options Inspired by 9c151c43b3ee85fe8cb7d4cdadb45115807c6710 by JamesBromberger/bootstrap-vz --- bootstrapvz/common/tasks/grub.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bootstrapvz/common/tasks/grub.py b/bootstrapvz/common/tasks/grub.py index 5fe60b2..f61d175 100644 --- a/bootstrapvz/common/tasks/grub.py +++ b/bootstrapvz/common/tasks/grub.py @@ -27,7 +27,10 @@ class ConfigureGrub(Task): grub_def = os.path.join(info.root, 'etc/default/grub') sed_i(grub_def, '^#GRUB_TERMINAL=console', 'GRUB_TERMINAL=console') sed_i(grub_def, '^GRUB_CMDLINE_LINUX_DEFAULT="quiet"', - 'GRUB_CMDLINE_LINUX_DEFAULT="console=ttyS0"') + 'GRUB_CMDLINE_LINUX_DEFAULT="console=hvc0"') + sed_i(grub_def, '^GRUB_TIMEOUT=[0-9]+', 'GRUB_TIMEOUT=0\n' + 'GRUB_HIDDEN_TIMEOUT=true') + sed_i(grub_def, '^#GRUB_DISABLE_RECOVERY="true"', 'GRUB_DISABLE_RECOVERY="true"') class InstallGrub_1_99(Task):