Small fixes for Azure images

- Add apt import for backports
 - Comment GRUB_HIDDEN_TIMEOUT so we can set GRUB_TIMEOUT.
This commit is contained in:
Stephen A. Zarkos 2015-08-06 00:21:23 +00:00
parent 0212db733d
commit 3f743d01b1
2 changed files with 2 additions and 0 deletions

View file

@ -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):

View file

@ -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')