lp:~ubuntu-branches/ubuntu/precise/lxc/precise-201202030136
- Get this branch:
- bzr branch lp:~ubuntu-branches/ubuntu/precise/lxc/precise-201202030136
Branch merges
- Ubuntu branches: Pending requested
-
Diff: 30277 lines (+485/-28364) (has conflicts)105 files modified.pc/0001-monitor-support-quit.patch/src/lxc/arguments.h (+0/-89)
.pc/0001-monitor-support-quit.patch/src/lxc/lxc_monitor.c (+0/-109)
.pc/0002-fix-personality-segfault.patch/src/lxc/confile.c (+0/-895)
.pc/0003-non-fatal-unsupported-personality.patch/src/lxc/confile.c (+0/-896)
.pc/0004-fix-ubuntu-template-only-install-essential.patch/templates/lxc-ubuntu.in (+0/-498)
.pc/0005-fix-sshd-template.patch/src/lxc/utils.c (+0/-193)
.pc/0005-fix-sshd-template.patch/templates/lxc-sshd.in (+0/-191)
.pc/0006-fix-checkconfig.patch/src/lxc/lxc-checkconfig.in (+0/-97)
.pc/0007-fix-lxc-clone-hostname.patch/src/lxc/lxc-clone.in (+0/-208)
.pc/0008-fix-bindhome-in-template.patch/templates/lxc-ubuntu.in (+0/-498)
.pc/0009-ubuntu-template-drop-resolvconf.patch/templates/lxc-ubuntu.in (+0/-506)
.pc/0010-ubuntu-template-capabilities.patch/templates/lxc-ubuntu.in (+0/-506)
.pc/0011-ubuntu-template-tun.patch/templates/lxc-ubuntu.in (+0/-507)
.pc/0012-ubuntu-template-tweaks.patch/templates/lxc-ubuntu.in (+0/-509)
.pc/0013-lxc-create-use-default-config.patch/src/lxc/lxc-create.in (+0/-179)
.pc/0014-ubuntu-templ-add-precise.patch/templates/lxc-ubuntu.in (+0/-512)
.pc/0015-ubuntu-templ-use-updates.patch/templates/lxc-ubuntu.in (+0/-512)
.pc/0016-nested-cgroups.patch/src/lxc/cgroup.c (+0/-429)
.pc/0017-pull-upstream-fedora-template.patch/templates/lxc-fedora.in (+0/-361)
.pc/0018-make-lxc-ps-search-proc.patch/src/lxc/lxc-ps.in (+0/-207)
.pc/0019-fix-lxc-ls-nested-cgroups.patch/src/lxc/lxc-ls.in (+0/-35)
.pc/0020-drop-cap-mac-admin.patch/templates/lxc-ubuntu.in (+0/-561)
.pc/0021-add-dev-full-to-whitelist.patch/templates/lxc-ubuntu.in (+0/-561)
.pc/0022-fix-lxc-destroy-bugs.patch/src/lxc/lxc-destroy.in (+0/-89)
.pc/0023-set-clone-children-earlier.patch/src/lxc/cgroup.c (+0/-540)
.pc/0024-lxc-create-and-clone-fixes.patch/src/lxc/lxc-clone.in (+0/-209)
.pc/0024-lxc-create-and-clone-fixes.patch/src/lxc/lxc-create.in (+0/-157)
.pc/0024-lxc-create-and-clone-fixes.patch/templates/lxc-debian.in (+0/-376)
.pc/0024-lxc-create-and-clone-fixes.patch/templates/lxc-opensuse.in (+0/-368)
.pc/0024-lxc-create-and-clone-fixes.patch/templates/lxc-ubuntu.in (+0/-567)
.pc/0025-lxc-ubuntu-drop-path-arg.patch/templates/lxc-ubuntu.in (+0/-566)
.pc/0026-support-new-reboot.patch/src/lxc/conf.h (+0/-229)
.pc/0026-support-new-reboot.patch/src/lxc/start.c (+0/-635)
.pc/0027-fix-lxc-netstat.patch/src/lxc/lxc-netstat.in (+0/-85)
.pc/0028-recursively-rmdir-cgroups.patch/src/lxc/cgroup.c (+0/-547)
.pc/0029-btrfs-clone-support.patch/src/lxc/lxc-clone.in (+0/-226)
.pc/0029-btrfs-clone-support.patch/src/lxc/lxc-create.in (+0/-270)
.pc/0029-btrfs-clone-support.patch/src/lxc/lxc-destroy.in (+0/-109)
.pc/0030-ubuntu-template-fail.patch/templates/lxc-ubuntu.in (+0/-541)
.pc/0031-ubuntu-template-resolvconf.patch/templates/lxc-ubuntu.in (+0/-543)
.pc/01-lxc-libdir.patch/configure (+0/-6620)
.pc/01-lxc-libdir.patch/configure.ac (+0/-190)
.pc/01-lxc-libdir.patch/src/lxc/Makefile.am (+0/-134)
.pc/01-lxc-libdir.patch/src/lxc/Makefile.in (+0/-1345)
.pc/02-lxc-distclean.patch/config/Makefile.am (+0/-2)
.pc/02-lxc-distclean.patch/config/Makefile.in (+0/-343)
.pc/03-lxc-configuration-path.patch/src/lxc/lxc-create.in (+0/-186)
.pc/04-debian-module-init-tools.patch/templates/lxc-debian.in (+0/-319)
.pc/05-debian-architecture.patch/templates/lxc-debian.in (+0/-320)
.pc/06-debian-ppc-architecture.patch/templates/lxc-debian.in (+0/-332)
.pc/07-debian-umount.patch/templates/lxc-debian.in (+0/-332)
.pc/08-debian-locales.patch/templates/lxc-debian.in (+0/-333)
.pc/09-debian-runlevel.patch/templates/lxc-debian.in (+0/-334)
.pc/10-debian-update-rcd.patch/templates/lxc-debian.in (+0/-334)
.pc/11-doc-ip-address.patch/doc/examples/lxc-complex.conf (+0/-23)
.pc/11-doc-ip-address.patch/doc/examples/lxc-complex.conf.in (+0/-23)
.pc/11-doc-ip-address.patch/doc/examples/lxc-macvlan.conf (+0/-8)
.pc/11-doc-ip-address.patch/doc/examples/lxc-macvlan.conf.in (+0/-8)
.pc/11-doc-ip-address.patch/doc/examples/lxc-phys.conf (+0/-9)
.pc/11-doc-ip-address.patch/doc/examples/lxc-phys.conf.in (+0/-9)
.pc/11-doc-ip-address.patch/doc/examples/lxc-veth.conf (+0/-9)
.pc/11-doc-ip-address.patch/doc/examples/lxc-veth.conf.in (+0/-9)
.pc/11-doc-ip-address.patch/doc/examples/lxc-vlan.conf (+0/-9)
.pc/11-doc-ip-address.patch/doc/examples/lxc-vlan.conf.in (+0/-9)
.pc/11-doc-ip-address.patch/doc/lxc.conf.sgml.in (+0/-700)
.pc/12-debian-config.patch/templates/lxc-debian.in (+0/-348)
.pc/13-lxc-create.patch/src/lxc/lxc-create.in (+0/-181)
config/Makefile.am (+1/-1)
config/Makefile.in (+1/-1)
configure (+2/-2)
configure.ac (+2/-2)
debian/patches/0032-start-check-caps.patch (+87/-0)
debian/patches/0033-ubuntu-template-multiarch.patch (+140/-0)
doc/examples/lxc-complex.conf (+3/-3)
doc/examples/lxc-complex.conf.in (+3/-3)
doc/examples/lxc-macvlan.conf (+1/-1)
doc/examples/lxc-macvlan.conf.in (+1/-1)
doc/examples/lxc-phys.conf (+1/-1)
doc/examples/lxc-phys.conf.in (+1/-1)
doc/examples/lxc-veth.conf (+1/-1)
doc/examples/lxc-veth.conf.in (+1/-1)
doc/examples/lxc-vlan.conf (+1/-1)
doc/examples/lxc-vlan.conf.in (+1/-1)
doc/lxc.conf.sgml.in (+4/-4)
src/lxc/Makefile.am (+0/-1)
src/lxc/Makefile.in (+1/-1)
src/lxc/arguments.h (+0/-3)
src/lxc/cgroup.c (+29/-190)
src/lxc/conf.h (+0/-1)
src/lxc/confile.c (+3/-6)
src/lxc/lxc-checkconfig.in (+1/-6)
src/lxc/lxc-clone.in (+8/-33)
src/lxc/lxc-create.in (+48/-157)
src/lxc/lxc-destroy.in (+7/-31)
src/lxc/lxc-ls.in (+1/-4)
src/lxc/lxc-netstat.in (+2/-12)
src/lxc/lxc-ps.in (+9/-34)
src/lxc/lxc_monitor.c (+3/-17)
src/lxc/start.c (+7/-54)
src/lxc/utils.c (+2/-3)
templates/lxc-debian.in (+37/-95)
templates/lxc-fedora.in (+16/-52)
templates/lxc-opensuse.in (+1/-2)
templates/lxc-sshd.in (+0/-1)
templates/lxc-ubuntu.in (+59/-52)
Related source package recipes
Branch information
- Owner:
- Ubuntu branches
- Status:
- Development
Recent revisions
- 57. By Serge Hallyn
-
debian/lxc.init: if there is a failure during lxc network setup, clean
up and exit. (LP: #925511) - 56. By Serge Hallyn
-
0032-start-
check-caps. patch: exit early and with a clear error message
if lxc-start is run with insufficient permissions. (LP: #925520) - 55. By Serge Hallyn
-
* debian/
lxc.apparmor: allow write under /sys/fs/cgroup (LP: #924281)
* remove 0032-refuse-console. patch. We'll need to fix the core of the
problem, likely in lxc-start. But /dev/tty is ok for container to
access. - 54. By Serge Hallyn
-
* 0032-refuse-
console. patch: don't allow access to 5:0, which is the
host's /dev/console.
* debian/lxc.apparmor, debian/rules: install an apparmor profile for
lxc-start. - 53. By Serge Hallyn
-
* debian/control: add btrfs-tools to lxc Suggests (LP: #942241)
* 0030-ubuntu-template- fail.patch: make lxc-ubuntu template fail on
error (LP: #922645)
* 0031-ubuntu-template- resolvconf. patch: handle /etc/resolv.conf being
a symlink as is now done by resolvconf by default. (LP: #922706)
* debian/lxcguest. lxcmount. upstart: emit mounted MOUNTPOINT=/run
to make resolvconf start. (LP: #922706) - 52. By Scott Moser
-
0029-btrfs-
clone-support. patch: add support for cloning via
btrfs snapshots (LP: #921921). - 51. By Serge Hallyn
-
* If the kernel supports container reboot disambuation, then don't drop
CAP_SYS_BOOT, and (always) try to use it after the container exits.
(LP: #914676)
* 0027-fix-lxc-netstat. patch: fix lxc-netstat for new nested cgroup
handling (LP: #921732)
* 0028-recursively-rmdir- cgroups. patch: if the container has created
any cgroups (i.e. by starting libvirt), make sure to delete those.
(LP: #921808) - 50. By Serge Hallyn
-
0025-lxc-
ubuntu- drop-path- arg.patch: don't show '--path' argument in
help output, and replace --clean with --flush-cache.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/precise/lxc
