lp:~ubuntu-branches/ubuntu/quantal/lxc/quantal-201208081743
Created by
Ubuntu Package Importer
and last modified
- Get this branch:
- bzr branch lp:~ubuntu-branches/ubuntu/quantal/lxc/quantal-201208081743
Members of
Ubuntu branches
can upload to this branch. Log in for directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Ubuntu branches: Pending requested
-
Diff: 168048 lines (+3452/-81365) (has conflicts)151 files modified.pc/0013-lxc-create-use-default-config.patch/src/lxc/lxc-create.in (+0/-294)
.pc/0030-ubuntu-template-fail.patch/templates/lxc-ubuntu.in (+0/-651)
.pc/0031-ubuntu-template-resolvconf.patch/templates/lxc-ubuntu.in (+0/-653)
.pc/0044-lxc-destroy-rm-autos/src/lxc/lxc-destroy.in (+0/-110)
.pc/0045-fix-other-templates/templates/lxc-busybox.in (+0/-307)
.pc/0045-fix-other-templates/templates/lxc-fedora.in (+0/-397)
.pc/0045-fix-other-templates/templates/lxc-sshd.in (+0/-192)
.pc/0045-fix-other-templates/templates/lxc-ubuntu-cloud.in (+0/-304)
.pc/0045-fix-other-templates/templates/lxc-ubuntu.in (+0/-657)
.pc/0046-lxc-clone-change-hwaddr/src/lxc/lxc-clone.in (+0/-280)
.pc/0047-bindhome-check-shell/templates/lxc-ubuntu.in (+0/-657)
.pc/0049-ubuntu-template-sudo-and-cleanup/templates/lxc-ubuntu.in (+0/-668)
.pc/0050-clone-lvm-sizes/src/lxc/lxc-clone.in (+0/-294)
.pc/0052-ubuntu-bind-user-conflict/templates/lxc-ubuntu.in (+0/-673)
.pc/0053-lxc-start-pin-rootfs/src/lxc/conf.c (+0/-2053)
.pc/0053-lxc-start-pin-rootfs/src/lxc/conf.h (+0/-239)
.pc/0053-lxc-start-pin-rootfs/src/lxc/start.c (+0/-724)
.pc/0054-ubuntu-debug/templates/lxc-ubuntu-cloud.in (+0/-304)
.pc/0054-ubuntu-debug/templates/lxc-ubuntu.in (+0/-693)
.pc/0055-ubuntu-handle-badgrp/templates/lxc-ubuntu.in (+0/-699)
.pc/0056-dont-watch-utmp/src/lxc/start.c (+0/-740)
.pc/0057-update-manpages/doc/lxc-create.sgml.in (+0/-166)
.pc/0057-update-manpages/doc/lxc-destroy.sgml.in (+0/-111)
.pc/0057-update-manpages/doc/lxc-start.sgml.in (+0/-200)
.pc/0057-update-manpages/doc/lxc.conf.sgml.in (+0/-743)
.pc/0058-fixup-ubuntu-cloud/templates/lxc-ubuntu-cloud.in (+0/-311)
.pc/0059-reenable-daily-cloudimg/templates/lxc-ubuntu-cloud.in (+0/-351)
.pc/0060-lxc-shutdown/configure (+0/-6555)
.pc/0060-lxc-shutdown/configure.ac (+0/-194)
.pc/0060-lxc-shutdown/lxc.spec (+0/-131)
.pc/0060-lxc-shutdown/lxc.spec.in (+0/-131)
.pc/0060-lxc-shutdown/src/lxc/Makefile.am (+0/-144)
.pc/0060-lxc-shutdown/src/lxc/Makefile.in (+0/-1385)
.pc/0061-lxc-start-apparmor/src/lxc/Makefile.am (+0/-145)
.pc/0061-lxc-start-apparmor/src/lxc/Makefile.in (+0/-1388)
.pc/0061-lxc-start-apparmor/src/lxc/conf.c (+0/-2098)
.pc/0061-lxc-start-apparmor/src/lxc/conf.h (+0/-241)
.pc/0061-lxc-start-apparmor/src/lxc/confile.c (+0/-1002)
.pc/0061-lxc-start-apparmor/src/lxc/start.c (+0/-744)
.pc/0062-templates-relative-paths/src/lxc/conf.c (+0/-2099)
.pc/0062-templates-relative-paths/templates/lxc-debian.in (+0/-321)
.pc/0062-templates-relative-paths/templates/lxc-fedora.in (+0/-413)
.pc/0062-templates-relative-paths/templates/lxc-lenny.in (+0/-309)
.pc/0062-templates-relative-paths/templates/lxc-opensuse.in (+0/-390)
.pc/0062-templates-relative-paths/templates/lxc-sshd.in (+0/-225)
.pc/0062-templates-relative-paths/templates/lxc-ubuntu-cloud.in (+0/-359)
.pc/0062-templates-relative-paths/templates/lxc-ubuntu.in (+0/-700)
.pc/0063-check-apparmor-enabled/src/lxc/lxc_init.c (+0/-219)
.pc/0063-check-apparmor-enabled/src/lxc/start.c (+0/-800)
.pc/0064-apparmor-mount-proc/src/lxc/conf.c (+0/-2125)
.pc/0064-apparmor-mount-proc/src/lxc/conf.h (+0/-243)
.pc/0064-apparmor-mount-proc/src/lxc/start.c (+0/-836)
.pc/0065-fix-bindhome-relpath/templates/lxc-ubuntu.in (+0/-700)
.pc/0066-confile-typo/src/lxc/confile.c (+0/-1022)
.pc/0067-templates-lxc-profile/templates/lxc-busybox.in (+0/-312)
.pc/0067-templates-lxc-profile/templates/lxc-debian.in (+0/-321)
.pc/0067-templates-lxc-profile/templates/lxc-fedora.in (+0/-413)
.pc/0067-templates-lxc-profile/templates/lxc-lenny.in (+0/-309)
.pc/0067-templates-lxc-profile/templates/lxc-opensuse.in (+0/-390)
.pc/0067-templates-lxc-profile/templates/lxc-sshd.in (+0/-225)
.pc/0067-templates-lxc-profile/templates/lxc-ubuntu-cloud.in (+0/-359)
.pc/0067-templates-lxc-profile/templates/lxc-ubuntu.in (+0/-705)
.pc/0068-fix-lxc-config-layout/templates/lxc-ubuntu-cloud.in (+0/-361)
.pc/0068-fix-lxc-config-layout/templates/lxc-ubuntu.in (+0/-707)
.pc/0069-ubuntu-cloud-fix/templates/lxc-ubuntu-cloud.in (+0/-361)
.pc/0070-templates-rmdir-dev-shm/templates/lxc-ubuntu-cloud.in (+0/-366)
.pc/0070-templates-rmdir-dev-shm/templates/lxc-ubuntu.in (+0/-707)
.pc/0071-ubuntu-cloud-fix-image-extraction/templates/lxc-ubuntu-cloud.in (+0/-377)
.pc/0072-lxc-shutdown-help/src/lxc/lxc-shutdown.in (+0/-147)
.pc/0073-lxc-destroy-waits-before-destroy/src/lxc/lxc-destroy.in (+0/-121)
.pc/0074-lxc-execute-find-init/src/lxc/execute.c (+0/-90)
.pc/0076-fix-sprintfs/src/lxc/cgroup.c (+0/-625)
.pc/0076-fix-sprintfs/src/lxc/commands.c (+0/-297)
.pc/0076-fix-sprintfs/src/lxc/conf.c (+0/-2171)
.pc/0076-fix-sprintfs/src/lxc/execute.c (+0/-128)
.pc/0076-fix-sprintfs/src/lxc/freezer.c (+0/-125)
.pc/0076-fix-sprintfs/src/lxc/lxc_monitor.c (+0/-111)
.pc/0076-fix-sprintfs/src/lxc/network.c (+0/-1000)
.pc/0076-fix-sprintfs/src/lxc/state.c (+0/-162)
.pc/0077-execute-without-rootfs/src/lxc/conf.c (+0/-2224)
.pc/0078-lxc-clone-quote-line/src/lxc/lxc-clone.in (+0/-298)
.pc/0079-quantal-support/templates/lxc-ubuntu-cloud.in (+0/-377)
.pc/0079-quantal-support/templates/lxc-ubuntu.in (+0/-717)
.pc/0080-drop-maverick/templates/lxc-ubuntu-cloud.in (+0/-377)
.pc/0080-drop-maverick/templates/lxc-ubuntu.in (+0/-717)
.pc/0081-fix-multiarch-install/templates/lxc-ubuntu.in (+0/-715)
.pc/0082-umount-old-proc/src/lxc/conf.c (+0/-2234)
.pc/0082-umount-old-proc/src/lxc/start.c (+0/-836)
.pc/0083-ubuntu-simplify-template/templates/lxc-ubuntu.in (+0/-715)
.pc/0084-lxc-ubuntu-drop-duplicate-code.patch/templates/lxc-ubuntu.in (+0/-716)
.pc/0085-pivot-dir/templates/lxc-ubuntu-cloud.in (+0/-377)
.pc/0085-pivot-dir/templates/lxc-ubuntu.in (+0/-688)
.pc/0086-lxc-unshare-zero-args/src/lxc/lxc_unshare.c (+0/-223)
.pc/0087-lxc-ls-dash/src/lxc/lxc-ls.in (+0/-39)
.pc/0088-ubuntu-template-flock/templates/lxc-altlinux.in (+0/-455)
.pc/0088-ubuntu-template-flock/templates/lxc-debian.in (+0/-323)
.pc/0088-ubuntu-template-flock/templates/lxc-fedora.in (+0/-417)
.pc/0088-ubuntu-template-flock/templates/lxc-lenny.in (+0/-312)
.pc/0088-ubuntu-template-flock/templates/lxc-opensuse.in (+0/-392)
.pc/0088-ubuntu-template-flock/templates/lxc-ubuntu-cloud.in (+0/-379)
.pc/0088-ubuntu-template-flock/templates/lxc-ubuntu.in (+0/-690)
.pc/0089-lxc-netstat-exec/src/lxc/lxc-netstat.in (+0/-116)
.pc/0090-lxc-ubuntu-use-dpkg-add-architecture/templates/lxc-ubuntu.in (+0/-690)
.pc/0091-introduce-container-hooks.patch/src/lxc/conf.c (+0/-2240)
.pc/0091-introduce-container-hooks.patch/src/lxc/conf.h (+0/-244)
.pc/0091-introduce-container-hooks.patch/src/lxc/confile.c (+0/-1022)
.pc/0091-introduce-container-hooks.patch/src/lxc/start.c (+0/-834)
.pc/0092-clone-no-dhclient.conf-update-when-not-hardcoded/src/lxc/lxc-clone.in (+0/-298)
.pc/0093-lxc-clone-copy-fstab/src/lxc/lxc-clone.in (+0/-298)
.pc/0094-fix-dev-shm-check/templates/lxc-ubuntu-cloud.in (+0/-379)
.pc/0094-fix-dev-shm-check/templates/lxc-ubuntu.in (+0/-695)
.pc/0095-lxc-clone-change-uuid-on-xfs.patch/src/lxc/lxc-clone.in (+0/-298)
.pc/0096-lxc-wait-add-timeout.patch/doc/lxc-wait.sgml.in (+0/-156)
.pc/0096-lxc-wait-add-timeout.patch/src/lxc/arguments.h (+0/-94)
.pc/0096-lxc-wait-add-timeout.patch/src/lxc/lxc_wait.c (+0/-156)
.pc/0097-seccomp/README (+54/-0)
.pc/0097-seccomp/configure.ac (+195/-0)
.pc/0097-seccomp/src/lxc/Makefile.am (+145/-0)
.pc/0097-seccomp/src/lxc/conf.h (+255/-0)
.pc/0097-seccomp/src/lxc/confile.c (+1062/-0)
.pc/0097-seccomp/src/lxc/lxc-clone.in (+304/-0)
.pc/0097-seccomp/src/lxc/start.c (+840/-0)
.pc/01-lxc-directories.patch/configure (+0/-6555)
.pc/01-lxc-directories.patch/configure.ac (+0/-194)
.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/-318)
.pc/04-lxc-create-template-name.patch/src/lxc/lxc-create.in (+0/-313)
.pc/05-doc-ip-address.patch/doc/examples/lxc-complex.conf (+0/-23)
.pc/05-doc-ip-address.patch/doc/examples/lxc-complex.conf.in (+0/-23)
.pc/05-doc-ip-address.patch/doc/examples/lxc-macvlan.conf (+0/-8)
.pc/05-doc-ip-address.patch/doc/examples/lxc-macvlan.conf.in (+0/-8)
.pc/05-doc-ip-address.patch/doc/examples/lxc-phys.conf (+0/-9)
.pc/05-doc-ip-address.patch/doc/examples/lxc-phys.conf.in (+0/-9)
.pc/05-doc-ip-address.patch/doc/examples/lxc-veth.conf (+0/-9)
.pc/05-doc-ip-address.patch/doc/examples/lxc-veth.conf.in (+0/-9)
.pc/05-doc-ip-address.patch/doc/examples/lxc-vlan.conf (+0/-9)
.pc/05-doc-ip-address.patch/doc/examples/lxc-vlan.conf.in (+0/-9)
.pc/05-doc-ip-address.patch/doc/lxc.conf.sgml.in (+0/-743)
.pc/07-lxc-netstat.patch/src/lxc/lxc-netstat.in (+0/-95)
.pc/08-lxc-debconf.patch/src/lxc/lxc-create.in (+0/-294)
.pc/09-lxc-create-trap-name.patch/src/lxc/lxc-create.in (+0/-294)
.pc/10-lxc-clone-trap-name.patch/src/lxc/lxc-clone.in (+0/-280)
.pc/11-lxc-console-escape.patch/src/lxc/lxc_console.c (+0/-259)
.pc/12-lxc-create-rootfs.patch/src/lxc/lxc-create.in (+0/-294)
.pc/applied-patches (+65/-0)
debian/patches/0097-seccomp (+370/-0)
doc/lxc-shutdown.sgml.in (+0/-97)
src/lxc/lxc-shutdown.in (+0/-147)
src/lxc/lxcseccomp.h (+41/-0)
src/lxc/seccomp.c (+121/-0)
Branch information
- Owner:
- Ubuntu branches
- Status:
- Development
Recent revisions
- 126. By Serge Hallyn <serge@serge-laptop>
-
[ Serge Hallyn ]
* lxc.lxc-net.upstart: replace the check for USE_LXC_BRIDGE (which could be
changed from true to false after starting lxc-net) with one for the
existence /var/run/lxc. (LP: #1019290)
* 0095-lxc-clone-change- uuid-on- xfs.patch: give each cloned xfs-backed
lvm partition a unique uuid so they can be mounted simultaneously.
(LP: #1013549)
* 0096-lxc-wait-add- timeout. patch: patch submitted upstream to add a timeout
option to lxc-wait. (LP: #1020179) - 123. By Serge Hallyn
-
[ Stéphane Graber ]
* debian/apparmor/ lxc-default- with-nesting: allow mounting /proc and /sys
so containers can be created.[ Serge Hallyn ]
* 0093-lxc-clone-copy- fstab: fix updating of lxc.mount entries in lxc-clone
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/quantal/lxc