From 3f743d01b146b65329e16e83ff0c6ec07bb8e70c Mon Sep 17 00:00:00 2001 From: "Stephen A. Zarkos" Date: Thu, 6 Aug 2015 00:21:23 +0000 Subject: [PATCH] Small fixes for Azure images - Add apt import for backports - Comment GRUB_HIDDEN_TIMEOUT so we can set GRUB_TIMEOUT. --- bootstrapvz/providers/azure/__init__.py | 1 + bootstrapvz/providers/azure/tasks/boot.py | 1 + 2 files changed, 2 insertions(+) diff --git a/bootstrapvz/providers/azure/__init__.py b/bootstrapvz/providers/azure/__init__.py index 7d2249d..970a5db 100644 --- a/bootstrapvz/providers/azure/__init__.py +++ b/bootstrapvz/providers/azure/__init__.py @@ -5,6 +5,7 @@ import tasks.image from bootstrapvz.common.tasks import loopback from bootstrapvz.common.tasks import initd from bootstrapvz.common.tasks import ssh +from bootstrapvz.common.tasks import apt def validate_manifest(data, validator, error): diff --git a/bootstrapvz/providers/azure/tasks/boot.py b/bootstrapvz/providers/azure/tasks/boot.py index c93b85a..ccd961a 100644 --- a/bootstrapvz/providers/azure/tasks/boot.py +++ b/bootstrapvz/providers/azure/tasks/boot.py @@ -32,4 +32,5 @@ class ConfigureGrub(Task): grub_config = os.path.join(info.root, 'etc/default/grub') sed_i(grub_config, r'^(GRUB_CMDLINE_LINUX_DEFAULT=.*)', r'GRUB_CMDLINE_LINUX_DEFAULT=""') sed_i(grub_config, r'^(GRUB_CMDLINE_LINUX*=".*)"\s*$', r'\1console=tty0 console=ttyS0,115200n8 earlyprintk=ttyS0,115200 rootdelay=300"') + sed_i(grub_config, r'^(GRUB_HIDDEN_TIMEOUT=).*', r'#GRUB_HIDDEN_TIMEOUT=true') sed_i(grub_config, r'^.*(GRUB_TIMEOUT=).*$', r'GRUB_TIMEOUT=5')