Merge lp:~smoser/ubuntu/quantal/lxc/lp-1066084 into lp:ubuntu/quantal/lxc

[Scott Moser]

[Serge Hallyn (serge-hallyn)]

Thanks, merged into ubuntu:lxc. I'm not sure how that will fall out when r opens up. Hopefully it gets copied over automatically.

review: Approve

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-10-04 17:08:11 +0000
+++ .pc/applied-patches	2012-10-12 19:19:22 +0000
@@ -103,3 +103,4 @@
 0222-debian-dhcp3-package
 0223-ubuntu-template-user-msg
 0224-ubuntu-templates-devtmpfs
+0225-ubuntu-cloud-numeric-owner
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-10-04 18:43:50 +0000
+++ debian/changelog	2012-10-12 19:19:22 +0000
@@ -1,3 +1,10 @@
+lxc (0.8.0~rc1-4ubuntu38) UNRELEASED; urgency=low
+
+  * ubuntu-cloud template: use --numeric-owner when extracting root filesystems
+    with tar (LP: #1066084)
+
+ -- Scott Moser <[e-mail]>  Fri, 12 Oct 2012 15:17:16 -0400
+
 lxc (0.8.0~rc1-4ubuntu37) quantal; urgency=low
 
   * update 0222-debian-dhcp3-package: use dhcp3-client, not server!
 
=== added file 'debian/patches/0225-ubuntu-cloud-numeric-owner'
--- debian/patches/0225-ubuntu-cloud-numeric-owner	1970-01-01 00:00:00 +0000
+++ debian/patches/0225-ubuntu-cloud-numeric-owner	2012-10-12 19:19:22 +0000
@@ -0,0 +1,20 @@
+Description: ubuntu-cloud template: extract root tar with --numeric-owner
+ when extracting the tarball of the filesystem it must be done with
+ --numeric-owner.  Without this argument, ownership is potentially
+ broken because tar converts the username/groupname to uid/gid.
+ this does not necessarily match the entries in /etc/passwd or group
+ inside the extracted root.
+Author: Scott Moser <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/1066084
+Forwarded: no
+--- a/templates/lxc-ubuntu-cloud.in
++++ b/templates/lxc-ubuntu-cloud.in
+@@ -341,7 +341,7 @@ mkdir -p /var/lock/subsys/
+     echo "Extracting container rootfs"
+     mkdir -p $rootfs
+     cd $rootfs
+-    tar -zxf $cache/$filename
++    tar --numeric-owner -zxf $cache/$filename
+ 
+ 
+     if [ $cloud -eq 0 ]; then
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-10-04 17:08:11 +0000
+++ debian/patches/series	2012-10-12 19:19:22 +0000
@@ -105,3 +105,4 @@
 0222-debian-dhcp3-package
 0223-ubuntu-template-user-msg
 0224-ubuntu-templates-devtmpfs
+0225-ubuntu-cloud-numeric-owner
 
=== modified file 'templates/lxc-ubuntu-cloud.in'
--- templates/lxc-ubuntu-cloud.in	2012-10-04 17:08:11 +0000
+++ templates/lxc-ubuntu-cloud.in	2012-10-12 19:19:22 +0000
@@ -341,7 +341,7 @@
     echo "Extracting container rootfs"
     mkdir -p $rootfs
     cd $rootfs
-    tar -zxf $cache/$filename
+    tar --numeric-owner -zxf $cache/$filename
 
 
     if [ $cloud -eq 0 ]; then