openstack/deb-python-diskimage-builder
Code Issues Proposed changes

Merge "Fix grub/linux text mode override."

Browse Source
This commit is contained in:
Jenkins
2013-09-18 00:05:12 +00:00
committed by Gerrit Code Review
parent 6d1f03bda3 d799ad5beb
commit bd632a92fd
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
elements/base/finalise.d/52-force-text-mode-console
View File

@@ -7,18 +7,20 @@ DISTRO=`lsb_release -si` || true
GRUBFILE="" GRUBFILE=""
echo 'GRUB_TERMINAL=console' >>/etc/default/grub
echo 'GRUB_GFXPAYLOAD_LINUX=text' >>/etc/default/grub
case $DISTRO in case $DISTRO in
'Ubuntu'|'Debian') 'Ubuntu'|'Debian')
sed -i -e 's/\(^GRUB_CMDLINE_LINUX.*\)"$/\1 nomodeset vga=normal"/' /etc/default/grub sed -i -e 's/\(^GRUB_CMDLINE_LINUX.*\)"$/\1 nofb nomodeset vga=normal"/' /etc/default/grub
update-grub
;; ;;
'Fedora') 'Fedora')
# By default the F19 cloud image is using extlinux to boot the image # By default the F19 cloud image is using extlinux to boot the image
if [ -f /boot/grub2/grub.cfg ]; then if [ -f /boot/grub2/grub.cfg ]; then
echo 'GRUB_CMDLINE_LINUX="nomodeset vga=normal"' >/etc/default/grub echo 'GRUB_CMDLINE_LINUX="nofb nomodeset vga=normal"' >/etc/default/grub
sed -i -e 's/terminal_output gfxterm/terminal_output console/' /boot/grub2/grub.cfg sed -i -e 's/terminal_output gfxterm/terminal_output console/' /boot/grub2/grub.cfg
grub2-mkconfig -o /boot/grub2/grub.cfg
fi fi
;; ;;
esac esac
echo 'GRUB_TERMINAL=console' >>/etc/default/grub