kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 15:36:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make extlinux output boot messages to the serial console (fixes #136)

Browse source
This commit is contained in:
Anders Ingemann 2014-12-20 15:42:14 +01:00
parent 200c5086e5
commit 58d66fea68
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bootstrapvz/common/task_groups.py
View file

@ -138,7 +138,7 @@ def get_bootloader_group(manifest):
group.append(boot.InstallGrub_2) group.append(boot.InstallGrub_2)
if manifest.system['bootloader'] == 'extlinux': if manifest.system['bootloader'] == 'extlinux':
group.extend([boot.AddExtlinuxPackage, group.extend([boot.AddExtlinuxPackage,
boot.ConfigureExtLinux, boot.ConfigureExtlinux,
boot.InstallExtLinux]) boot.InstallExtLinux])
return group return group

8
bootstrapvz/common/tasks/boot.py
View file

@ -148,7 +148,7 @@ class AddExtlinuxPackage(Task):
info.packages.add('syslinux-common') info.packages.add('syslinux-common')
class ConfigureExtLinux(Task): class ConfigureExtlinux(Task):
description = 'Configuring extlinux' description = 'Configuring extlinux'
phase = phases.system_modification phase = phases.system_modification
predecessors = [filesystem.FStab] predecessors = [filesystem.FStab]
@ -157,14 +157,14 @@ class ConfigureExtLinux(Task):
def run(cls, info): def run(cls, info):
from bootstrapvz.common.tools import sed_i from bootstrapvz.common.tools import sed_i
extlinux_def = os.path.join(info.root, 'etc/default/extlinux') extlinux_def = os.path.join(info.root, 'etc/default/extlinux')
sed_i(extlinux_def, '^EXTLINUX_PARAMETERS="ro quiet"', sed_i(extlinux_def, r'^EXTLINUX_PARAMETERS="([^"]+)"$',
'EXTLINUX_PARAMETERS="ro console=ttyS0"') r'EXTLINUX_PARAMETERS="\1 console=ttyS0"')
class InstallExtLinux(Task): class InstallExtLinux(Task):
description = 'Installing extlinux' description = 'Installing extlinux'
phase = phases.system_modification phase = phases.system_modification
predecessors = [filesystem.FStab] predecessors = [filesystem.FStab, ConfigureExtlinux]
@classmethod @classmethod
def run(cls, info): def run(cls, info):