-
Committer:
Cody A.W. Somerville
-
Date:
2010-05-20 02:38:38 UTC
-
mfrom:
(0.1.1041 sg-2.x)
-
Revision ID:
cody.somerville@canonical.com-20100520023838-u0g5152wdq3px6lx
* Merge from Debian, remaining changes:
. data/debian-cd/*:
- Added debian-cd data directories for Ubuntu releases.
. debian/control:
- Update maintainer and VCS fields.
. functions/defaults.sh:
- Use LH_MIRROR_CHROOT as default for LH_MIRROR_DEBIAN_INSTALLER instead
of LH_MIRROR_BOOTSTRAP.
. helpers/binary:
- Run chroot_{debianchroot,dpkg,sysv-rc} helpers on chroot build
setup and teardown.
. helpers/binary_debian-installer:
- Add support for ubuntu branded directories in netbook images.
- If LH_DEBIAN_INSTALLER_URL is already set, use it.
. helpers/binary_manifest:
- Change contents and format of manifest file to be just the output of
'dpkg-query -W' from within the chroot.
- Name copy of manifest kept outside of the binary image as
binary.manifest instead of binary.packages.
- Do not generate packages.txt at all anymore. Instead, use format used
for packages.txt to create filesystem.manifest.
. helpers/binary_rootfs:
- Add support for creating rootfs as ubifs.
. helpers/binary_syslinux:
- Replace menu binary name sed hackery with more robust hack.
- Use relative path to splash and vesamenu.c32 to avoid complications
when an ISO is converted into a usb image.
- Correctly set KERNEL_PATH, SCREEN_PATH, LIVE_KERNEL_PATH,
LIVE_INSTALL_KERNEL_PATH, and LIVE_SCREEN_PATH when running in Ubuntu
mode.
. helpers/binary_usb:
- Add debug message that outputs information about the filesystem.
- Call our partitions 'OEM_BUILD' instead of 'DEBIAN_LIVE'.
. helpers/chroot_hacks:
- Set CASPER_GENERATE_UUID=1 when regenerating initramfs.
. helpers/chroot_local-hooks:
- Make copy of config directory available inside chroot while executing
local chroot hooks.
. templates/syslinux/*:
- Do not include help option in menu nor help related config.
- Use relative path to splash and vesamenu.c32 to avoid complications
when an ISO is converted into a usb image.
- Use custom splash.png that has Canonical + Ubuntu logo.