~noskcaj/ubuntu/trusty/elilo/merge

Viewing all changes in revision 19.

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-08-22 21:17:34 UTC
  • mfrom: (2.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110822211734-v5jai00gvy4834i2
Tags: 3.12-4ubuntu1
* Resynchronise with Debian.  Remaining changes:
  - Add nasty hacks for Apple systems - switch to text mode on startup,
    pass the framebuffer size to the system on boot, and automatically set
    legacy-free option on ia32 Apple systems.
    (needs-to-go-upstream)
  - Perform some Ubuntu branding, put all files in /EFI/ubuntu.
    (ubuntu-only)
  - Add a modprobe call if efivars facility is not found.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: