-
Committer:
Bazaar Package Importer
-
Author(s):
Colin Watson
-
Date:
2009-01-29 22:14:20 UTC
-
mfrom:
(0.1.1 lenny)
-
Revision ID:
james.westby@ubuntu.com-20090129221420-8t0k75fjjaxskrqc
Tags: 1.98ubuntu1
* Resynchronise with Debian. Remaining changes:
- Use and depend on the Ubuntu keyring.
- Enable the restricted component by default, unless
apt-setup/restricted is preseeded to false.
- Set up the default sources.list to look in -updates and -security (the
latter from apt-setup/security_host) as well as the unadorned suite;
also -proposed if apt-setup/proposed is true.
- Use Ubuntu kernel image names.
- Allow preseeding base-installer/kernel/override-image to force a given
kernel to be used.
- Write out the resume partition as a UUID if possible.
- Install busybox-initramfs rather than busybox.
- If base-installer/use_unclean_target is asked, emit a warning to the
logs so that we know about it when diagnosing problems.
- Never select /dev/ramzswap* as a hibernation target.
* Backport from trunk (Ian Campbell, Frans Pop):
- Use -686 kernels for CentaurHauls processors again (effectively
undoing r55059) . According to 464962 the kernel has been fixed since
2.6.26-8. Closes: #504095