-
Committer:
Julien Lavergne
-
Date:
2010-10-06 18:03:41 UTC
-
mfrom:
(331.1.38 maverick)
-
Revision ID:
gilir@ubuntu.com-20101006180341-uryk2j7h9zqs11hz
Merge from upstream.
[ Evan Dandrea, Colin Watson ]
* Fix code to ensure that GRUB isn't installed to the installation device
when it's a USB stick; this was a combination of the installation device
typically being a partition rather than a disk device, and the fact that
grub-mkdevicemap now emits /dev/disk/by-id/ names rather than
traditional device names (LP: #630529).
* Automatic update of included source packages: apt-setup
1:0.45ubuntu3, base-installer 1.107ubuntu3, choose-mirror
2.33ubuntu2, grub-installer 1.55ubuntu4, user-setup 1.28ubuntu10.