From b06d9ff28e07685abbc7bfd664abba45981e0cf0 Mon Sep 17 00:00:00 2001 From: Kevin Olbrich Date: Mon, 4 Nov 2019 03:08:27 +0100 Subject: [PATCH] use elevator noop for all images and reorder commands --- bootstrapvz/providers/azure/tasks/boot.py | 1 + bootstrapvz/providers/kvm/tasks/boot.py | 7 +++++-- bootstrapvz/providers/virtualbox/tasks/boot.py | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/bootstrapvz/providers/azure/tasks/boot.py b/bootstrapvz/providers/azure/tasks/boot.py index 1b0b3c2..6685e08 100644 --- a/bootstrapvz/providers/azure/tasks/boot.py +++ b/bootstrapvz/providers/azure/tasks/boot.py @@ -32,4 +32,5 @@ class ConfigureGrub(Task): 'console=ttyS0,115200n8', 'earlyprintk=ttyS0,115200', 'rootdelay=300', + 'elevator=noop', ]) diff --git a/bootstrapvz/providers/kvm/tasks/boot.py b/bootstrapvz/providers/kvm/tasks/boot.py index 9b4a6cc..2aac885 100644 --- a/bootstrapvz/providers/kvm/tasks/boot.py +++ b/bootstrapvz/providers/kvm/tasks/boot.py @@ -14,8 +14,11 @@ class SetGrubConsolOutputDeviceToVirtual(Task): @classmethod def run(cls, info): - info.grub_config['GRUB_CMDLINE_LINUX'].append('console=tty0') - info.grub_config['GRUB_CMDLINE_LINUX'].append('elevator=noop') + info.grub_config['GRUB_CMDLINE_LINUX'].extend([ + 'console=tty0', + 'consoleblank=0', + 'elevator=noop', + ]) class SetGrubSystemdShowStatus(Task): diff --git a/bootstrapvz/providers/virtualbox/tasks/boot.py b/bootstrapvz/providers/virtualbox/tasks/boot.py index 51b1a15..7d6dac1 100644 --- a/bootstrapvz/providers/virtualbox/tasks/boot.py +++ b/bootstrapvz/providers/virtualbox/tasks/boot.py @@ -11,4 +11,8 @@ class AddVirtualConsoleGrubOutputDevice(Task): @classmethod def run(cls, info): - info.grub_config['GRUB_CMDLINE_LINUX_DEFAULT'].append('console=tty0') + info.grub_config['GRUB_CMDLINE_LINUX'].extend([ + 'console=tty0', + 'consoleblank=0', + 'elevator=noop', + ])