lp:~serge-hallyn/ubuntu/oneiric/lxc/fix-shutdown

Created by Serge Hallyn and last modified
Get this branch:
bzr branch lp:~serge-hallyn/ubuntu/oneiric/lxc/fix-shutdown
Only Serge Hallyn can upload to this branch. If you are Serge Hallyn please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Serge Hallyn
Status:
Development

Recent revisions

27. By Serge Hallyn

debian/patches/0010-fix-shutdown.patch: If /var/run is a symlink to /run
in the container, then opening /proc/<pid>/root/var/run/utmp will end up
opening the host's utmp. Therefore the hack detecting shutdown through
utmp fails. (LP: #817565)

26. By Serge Hallyn

debian/patches/0009-fix-lxc-ps.patch: make lxc-ps work when cgroup-bin
is installed. (LP: #817606)

25. By Serge Hallyn

add ubuntu-keyring to list of packages for oneiric. (LP: #817233)

24. By Serge Hallyn

* Merge from Debian (0.7.4.2-3) (LP: #812892)
  - patches: import debian's patches 02-07
    * 06 needed to be ported due to changes upstream
  - debian/lxc.manpages: switch to Debian version
  - debian/lxc.TODO
  - switch README.Debian for lxc.README.Debian from debian package
  - remove debian/watch and debian/gbp.conf
  - bump debian/compat
  - copy debian/copyright from debian package
  - copy debian/source/options
  - debian/control: increased debhelper version to >= 8.

* Remaining changes:
  - keep debian/patches/diff-to-bcbd102cb to bump to upstream git HEAD
  - keep ubuntu patches 0004-0006, which are pending acceptance upstream.
  - keep lxcguest package (not in debian):
    * debian/control: define package
    * debian/fstab.lxc and debian/fstab.libvirt
    * debian/lxcguest.console.upstart
    * debian/lxcguest.lxcguest.upstart
    * debian/lxcguest.lxcmount.upstart
    * debian/lxcguest.install
    * debian/lxc-is-container: keep Ubuntu-specific script
  - debian/local: a new set of scripts, NOT yet merged from Debian.
  - debian/lxc.default: keep example MIRROR
  - lxc-dev package (not in Ubuntu):
    * skip debian/control entry
    * skip debian/lxc-dev.install
  - debian/lxc.dirs:
    * keep Ubuntu-specific entries:
      * usr/share/lintian/overrides
      * usr/share/doc/lxc/examples
  - debian/lxc.docs: only in Ubuntu
  - debian/lxc.install: keep Ubuntu version
  - debian/rules: keep old version (new debian version is lovely but
    fails to build Ubuntu package.

* debian/patches/0007-bindhome-dont-add-groups.patch: when binding a user
  into container, don't auto-insert his groups from the host into the
  container (LP: #813403).

23. By Serge Hallyn

introduce lxc-is-container script and 'lxcguest' upstart job which both
detect (the script exploiting the upstart job) whether we are in a
container. (LP: #813075)

22. By Serge Hallyn

* Clean up packaging
  - remove 0002-disable-debian-checkroot-script.patch: it is wrong.
  - remove 0003-squeeze-missing-tty.patch: it is redundant.
  - diff-to-bcbd102cb: mark forwarded as not-needed
  - 0004-add-arm-to-supported-archs.patch: Add author and description.
  - 0004-0006: mark forwarded as yes
  - Not renumbering 0004-0006 as that is more confusing, and they
    will hopefully go away with 0.7.5.
  - remove dh_install calls from rules
  - rename lxc.overrides to lxc.lintian-overrides and remove rules entry
    to do so
  - remove commented out include of /usr/share/cdbs/1/rules/dpatch.mk

21. By Stéphane Graber

Add a Recommend on cgroup-bin (LP: #800456)

20. By Serge Hallyn

* Sync upstream 0.7.4.2
* Add diff up to git head.
  - Fix interaction with cgroups-bin (LP: #784093)
  - Fix arch support to create i386 containers on amd64 (LP: #798476)
  - Support a bind-mounted $HOME with template (LP: #800482)
* add debootstrap to Recommends (LP: #803745)
* debian/patchs updates:
  - refresh 0002-disable-debian-checkroot-script.patch
  - drop:
    * 0004-add-ubuntu-mirrors.patch
    * 0005-add-netbase-to-templates.patch
    * 0006-fix-template-syntax-error.patch
    * 0007-natty-template-install-lxcguest.patch
    * 0010-templates-use-dpkg.patch
  - renamed and updated:
    * 0008-add-arm-to-supported-archs.patch to
      0004-add-arm-to-supported-archs.patch
    * 0009-templates-dont-use-devpts-in-fstab to
      0005-dont-use-devpts-in-fstab
    * 0011-templates-allow-fuse.patch to
      0006-templates-allow-fuse.patch
* remove unused debian/lxc-start.sh
* include autoreconf.mk to force Makefile.in to be rebuilt
* Remaining changes over debian:
  - add lxcguest package
  - debian/control
    * keep docbook-utils in Build-Depends
  - lxc.default: add commented example MIRROR

19. By Serge Hallyn

Allow containers to access /dev/fuse (LP: #800886)

18. By Serge Hallyn

Import patch from stgraber to use dpkg to decide arch in lxc templates.
This is necessary for templates to work on arm.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:ubuntu/oneiric/lxc
This branch contains Public information 
Everyone can see this information.

Subscribers