-
Committer:
Bazaar Package Importer
-
Author(s):
Colin Watson
-
Date:
2011-06-16 01:31:01 UTC
-
mfrom:
(17.3.59 sid)
-
Revision ID:
james.westby@ubuntu.com-20110616013101-id0jjz8a3a9dxels
Tags: 1.99-7ubuntu1
* Resynchronise with Debian. Remaining changes:
- Adjust for default Ubuntu boot options ("quiet splash").
- Default to hiding the menu; holding down Shift at boot will show it.
- Set a monochromatic theme and an appropriate background for Ubuntu.
- Apply Ubuntu GRUB Legacy changes to legacy update-grub script.
- Fix backslash-escaping in merge_debconf_into_conf.
- Remove "GNU/Linux" from default distributor string.
- Add crashkernel option.
- Bypass menu unless other OSes are installed or Shift is pressed.
- Allow Shift to interrupt 'sleep --interruptible'.
- Reduce visual clutter in normal mode.
- Remove verbose messages printed before reading configuration.
- Suppress kernel/initrd progress messages, except in recovery mode.
- Show the boot menu if the previous boot failed.
- Don't generate device.map during grub-install or grub-mkconfig.
- Adjust upgrade version checks for Ubuntu.
- Suppress "GRUB loading" message unless Shift is held down.
- Adjust versions of grub-doc and grub-legacy-doc conflicts.
- Fix LVM/RAID probing in the absence of /boot/grub/device.map.
- Look for .mo files in /usr/share/locale-langpack first.
- Build-depend on qemu-kvm rather than qemu-system for grub-pc tests.
- Check hardware support before using gfxpayload=keep.
- Put second and subsequent Linux menu entries in a submenu.
- Preferred resolution detection for VBE.
- Set vt.handoff=7 for smooth handoff to kernel graphical mode.
- Update default/grub.md5sum to include maverick's default md5sum.
- Add nomodeset to Linux kernel arguments in recovery mode.