ubuntu/+source/grub:applied/ubuntu/natty-proposed

Last commit made on 2011-09-26
Get this branch:
git clone -b applied/ubuntu/natty-proposed https://git.launchpad.net/ubuntu/+source/grub
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
applied/ubuntu/natty-proposed
Repository:
lp:ubuntu/+source/grub

Recent commits

9880df0... by Colin Watson on 2011-09-23

Import patches-applied version 0.97-29ubuntu61.1 to applied/ubuntu/natty-proposed

Imported using git-ubuntu import.

Changelog parent: 8cf1ec0c242c2e86d34be0bab273140b190f896b
Unapplied parent: 310ce2a704c0b21a31945c90e0f2a0913054dc7c

New changelog entries:
  * Backport from Debian 0.97-39 (LP: #720558):
    - Support for Xen style xvd[a-z] devices. Thanks Ian Campbell.
      (Closes: #456776)
  * Don't use UUIDs for expressing xvd* devices as GRUB drives, as PV-GRUB
    can't handle it.

310ce2a... by Colin Watson on 2011-09-23

Import patches-unapplied version 0.97-29ubuntu61.1 to ubuntu/natty-proposed

Imported using git-ubuntu import.

Changelog parent: 943977293e151c624860f026223a4267faca4bbf

New changelog entries:
  * Backport from Debian 0.97-39 (LP: #720558):
    - Support for Xen style xvd[a-z] devices. Thanks Ian Campbell.
      (Closes: #456776)
  * Don't use UUIDs for expressing xvd* devices as GRUB drives, as PV-GRUB
    can't handle it.

8cf1ec0... by Colin Watson on 2011-03-17

Import patches-applied version 0.97-29ubuntu61 to applied/ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: d48430e7e9a9e24b8a11a706a81136b043e07aa4
Unapplied parent: 943977293e151c624860f026223a4267faca4bbf

New changelog entries:
  * Refine detection of Xen-only kernels: kernels with both CONFIG_XEN=y and
    CONFIG_PARAVIRT=y are now given both Xen entries (if a hypervisor is
    present) and non-Xen entries (LP: #692691).

9439772... by Colin Watson on 2011-03-17

Import patches-unapplied version 0.97-29ubuntu61 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 2d16b922ec4120df7484acb796c0e40dd41998fc

New changelog entries:
  * Refine detection of Xen-only kernels: kernels with both CONFIG_XEN=y and
    CONFIG_PARAVIRT=y are now given both Xen entries (if a hypervisor is
    present) and non-Xen entries (LP: #692691).

d48430e... by Colin Watson on 2010-02-26

Import patches-applied version 0.97-29ubuntu60 to applied/ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 0c39c3afa3df4916939b28a6a968a3d39c3c478b
Unapplied parent: 2d16b922ec4120df7484acb796c0e40dd41998fc

New changelog entries:
  * Backport from Debian 0.97-32 (we should really merge this properly!):
    [ Robert Millan ]
    - Split grub-doc in multiboot-doc and grub-legacy-doc (LP: #493968).
    ... and from Debian 0.97-59:
    - Rename grub.info to grub-legacy.info to avoid conflict with upcoming
      GRUB 2 manual.

2d16b92... by Colin Watson on 2010-02-26

Import patches-unapplied version 0.97-29ubuntu60 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 7ba037ea0757d4846784ce7275a0b4b3eaecf869

New changelog entries:
  * Backport from Debian 0.97-32 (we should really merge this properly!):
    [ Robert Millan ]
    - Split grub-doc in multiboot-doc and grub-legacy-doc (LP: #493968).
    ... and from Debian 0.97-59:
    - Rename grub.info to grub-legacy.info to avoid conflict with upcoming
      GRUB 2 manual.

0c39c3a... by Colin Watson on 2009-10-20

Import patches-applied version 0.97-29ubuntu59 to applied/ubuntu/karmic

Imported using git-ubuntu import.

Changelog parent: 148a1a468c4cdcda6532a4198a5fbd777ebb71b8
Unapplied parent: 7ba037ea0757d4846784ce7275a0b4b3eaecf869

New changelog entries:
  * Conflict with grub-pc, grub-coreboot, grub-efi-ia32, grub-efi-amd64, and
    grub-ieee1275; this upload ensures that /usr/sbin/update-grub is put
    back on systems that erroneously had both grub and grub-pc installed
    (LP: #455619).

7ba037e... by Colin Watson on 2009-10-20

Import patches-unapplied version 0.97-29ubuntu59 to ubuntu/karmic

Imported using git-ubuntu import.

Changelog parent: 4c409bfe9602836f6b91c0354f35c2b70fdde3fc

New changelog entries:
  * Conflict with grub-pc, grub-coreboot, grub-efi-ia32, grub-efi-amd64, and
    grub-ieee1275; this upload ensures that /usr/sbin/update-grub is put
    back on systems that erroneously had both grub and grub-pc installed
    (LP: #455619).

148a1a4... by Colin Watson on 2009-10-06

Import patches-applied version 0.97-29ubuntu58 to applied/ubuntu/karmic

Imported using git-ubuntu import.

Changelog parent: d3910582092cfb31268127162ae275e406094051
Unapplied parent: 4c409bfe9602836f6b91c0354f35c2b70fdde3fc

New changelog entries:
  * objcopy-absolute.diff (update): Remove .note, .comment, and
    .note.gnu.build-id sections from images (LP: #444703).

4c409bf... by Colin Watson on 2009-10-06

Import patches-unapplied version 0.97-29ubuntu58 to ubuntu/karmic

Imported using git-ubuntu import.

Changelog parent: abc28f12b64cddedec1de783de6d39e4c4219c5c

New changelog entries:
  * objcopy-absolute.diff (update): Remove .note, .comment, and
    .note.gnu.build-id sections from images (LP: #444703).