diff -Nru lxc-0.7.5/debian/changelog lxc-0.7.5/debian/changelog --- lxc-0.7.5/debian/changelog 2012-07-26 22:53:08.000000000 -0500 +++ lxc-0.7.5/debian/changelog 2012-08-29 16:22:46.000000000 -0500 @@ -1,3 +1,10 @@ +lxc (0.7.5-3ubuntu63) precise-proposed; urgency=low + + * 0092-lxc-ls-dont-list-dups: Pull upstream commit to fix multiple listings + of a container with multiple open consoles in lxc-ls. (LP: #1043018) + + -- Serge Hallyn Wed, 29 Aug 2012 16:21:59 -0500 + lxc (0.7.5-3ubuntu62) precise-proposed; urgency=low * lxc.postrm: support "purge" command (LP: #1029716) diff -Nru lxc-0.7.5/debian/patches/0092-lxc-ls-dont-list-dups lxc-0.7.5/debian/patches/0092-lxc-ls-dont-list-dups --- lxc-0.7.5/debian/patches/0092-lxc-ls-dont-list-dups 1969-12-31 18:00:00.000000000 -0600 +++ lxc-0.7.5/debian/patches/0092-lxc-ls-dont-list-dups 2012-08-29 16:21:54.000000000 -0500 @@ -0,0 +1,22 @@ +Description: don't list containers multiple times in lxc-ls + If a container has multiple open consoles, netstat -xa will show + multiple entries for that container. Use netstat -xl instead to + only show it once. + This is upstream commit bc71b5c54fee6cd3f66d47c57bb54048d49f1429 +Author: Rainer Weikusat +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/1043018 +Forwarded: no + +Index: lxc-0.7.5/src/lxc/lxc-ls.in +=================================================================== +--- lxc-0.7.5.orig/src/lxc/lxc-ls.in 2012-08-29 16:13:51.000000000 -0500 ++++ lxc-0.7.5/src/lxc/lxc-ls.in 2012-08-29 16:20:34.390118215 -0500 +@@ -24,7 +24,7 @@ + + ls "$@" -- $lxcpath + +-active=$(netstat -xa 2>/dev/null | grep $lxcpath | \ ++active=$(netstat -xl 2>/dev/null | grep $lxcpath | \ + sed -e 's#.*'"$lxcpath/"'\(.*\)/command#\1#'); + + if test -n "$active"; then diff -Nru lxc-0.7.5/debian/patches/series lxc-0.7.5/debian/patches/series --- lxc-0.7.5/debian/patches/series 2012-07-26 12:30:36.000000000 -0500 +++ lxc-0.7.5/debian/patches/series 2012-08-29 16:20:26.000000000 -0500 @@ -98,3 +98,4 @@ 0089-clone-no-dhclient.conf-update-when-not-hardcoded 0090-lxc-ubuntu-use-dpkg-add-architecture 0091-fix-dev-shm-check +0092-lxc-ls-dont-list-dups