Merge pull request #1249 from jedsmith/squash

oem-ec2-compat: blacklist xen_fbfront
This commit is contained in:
Michael Marineau 2015-05-11 17:49:50 -07:00
commit 50dd713b42
2 changed files with 7 additions and 0 deletions

View File

@ -0,0 +1,4 @@
# CoreOS GRUB settings for EC2
# Blacklist the Xen framebuffer module so it doesn't get loaded at boot
set linux_append="modprobe.blacklist=xen_fbfront"

View File

@ -43,4 +43,7 @@ src_prepare() {
src_install() {
insinto "/usr/share/oem"
doins ${T}/cloud-config.yml
if use ec2 ; then
newins ${FILESDIR}/grub-ec2.cfg grub.cfg
fi
}