diff -Nru libvirt-0.8.5/debian/changelog libvirt-0.8.5/debian/changelog --- libvirt-0.8.5/debian/changelog 2011-02-01 07:30:02.000000000 -0500 +++ libvirt-0.8.5/debian/changelog 2011-02-18 14:26:05.000000000 -0500 @@ -1,3 +1,10 @@ +libvirt (0.8.5-0ubuntu6) natty; urgency=low + + * debian/patches/9066-fix-lxc-console.patch: Cherry picked upstream patch + to fix console with LXC. (2fbec002031934c0e5ad660c6af6e34a2647ed3d) + + -- Chuck Short Fri, 18 Feb 2011 14:20:07 -0500 + libvirt (0.8.5-0ubuntu5) natty; urgency=low * Have upstart job source /etc/default/libvirt-bin. This is only a diff -Nru libvirt-0.8.5/debian/patches/9066-fix-lxc-console.patch libvirt-0.8.5/debian/patches/9066-fix-lxc-console.patch --- libvirt-0.8.5/debian/patches/9066-fix-lxc-console.patch 1969-12-31 19:00:00.000000000 -0500 +++ libvirt-0.8.5/debian/patches/9066-fix-lxc-console.patch 2011-02-18 14:15:45.000000000 -0500 @@ -0,0 +1,34 @@ +diff -Naurp libvirt-0.8.5.orig//src/lxc/lxc_container.c libvirt-0.8.5//src/lxc/lxc_container.c +--- libvirt-0.8.5.orig//src/lxc/lxc_container.c 2010-07-30 04:54:12.000000000 -0400 ++++ libvirt-0.8.5//src/lxc/lxc_container.c 2011-02-18 14:12:49.673206281 -0500 +@@ -463,7 +463,6 @@ static int lxcContainerPopulateDevices(v + { LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_NULL, 0666, "/dev/null" }, + { LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_ZERO, 0666, "/dev/zero" }, + { LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_FULL, 0666, "/dev/full" }, +- { LXC_DEV_MAJ_TTY, LXC_DEV_MIN_CONSOLE, 0600, "/dev/console" }, + { LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_RANDOM, 0666, "/dev/random" }, + { LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_URANDOM, 0666, "/dev/urandom" }, + }; +@@ -505,6 +504,11 @@ static int lxcContainerPopulateDevices(v + _("Failed to symlink /dev/pts/0 to /dev/tty1")); + return -1; + } ++ if (symlink("/dev/pts/0", "/dev/console") < 0) { ++ virRepotSystemError(errno, "%s", ++ _("Failed to symlink /dev/pts/0 to /dev/console")); ++ return -1; ++ } + + return 0; + } +diff -Naurp libvirt-0.8.5.orig//src/lxc/lxc_controller.c libvirt-0.8.5//src/lxc/lxc_controller.c +--- libvirt-0.8.5.orig//src/lxc/lxc_controller.c 2010-10-19 16:07:10.000000000 -0400 ++++ libvirt-0.8.5//src/lxc/lxc_controller.c 2011-02-18 14:13:03.640693975 -0500 +@@ -79,7 +79,6 @@ static int lxcSetContainerResources(virD + {'c', LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_RANDOM}, + {'c', LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_URANDOM}, + {'c', LXC_DEV_MAJ_TTY, LXC_DEV_MIN_TTY}, +- {'c', LXC_DEV_MAJ_TTY, LXC_DEV_MIN_CONSOLE}, + {'c', LXC_DEV_MAJ_TTY, LXC_DEV_MIN_PTMX}, + {0, 0, 0}}; + diff -Nru libvirt-0.8.5/debian/patches/series libvirt-0.8.5/debian/patches/series --- libvirt-0.8.5/debian/patches/series 2011-02-01 07:17:33.000000000 -0500 +++ libvirt-0.8.5/debian/patches/series 2011-02-18 14:16:48.000000000 -0500 @@ -20,3 +20,4 @@ 9021-fix-uint64_t.patch 9022-build-cleanup-declaration-of-xen-tests.patch 9023-vah-require-uuid.patch +9066-fix-lxc-console.patch