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

Proposed by Scott Moser on 2012-10-12
Status: Merged
Merge reported by: Serge Hallyn
Merged at revision: not available
Proposed branch: lp:~smoser/ubuntu/quantal/lxc/lp-1066084
Merge into: lp:ubuntu/quantal/lxc
Diff against target: 70 lines (+30/-1)
5 files modified
.pc/applied-patches (+1/-0)
debian/changelog (+7/-0)
debian/patches/0225-ubuntu-cloud-numeric-owner (+20/-0)
debian/patches/series (+1/-0)
templates/lxc-ubuntu-cloud.in (+1/-1)
To merge this branch: bzr merge lp:~smoser/ubuntu/quantal/lxc/lp-1066084
Reviewer Review Type Date Requested Status
Serge Hallyn Approve on 2012-10-15
Ubuntu branches 2012-10-12 Pending
Review via email: mp+129499@code.launchpad.net
To post a comment you must log in.
Serge Hallyn (serge-hallyn) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.pc/applied-patches'
2--- .pc/applied-patches 2012-10-04 17:08:11 +0000
3+++ .pc/applied-patches 2012-10-12 19:19:22 +0000
4@@ -103,3 +103,4 @@
5 0222-debian-dhcp3-package
6 0223-ubuntu-template-user-msg
7 0224-ubuntu-templates-devtmpfs
8+0225-ubuntu-cloud-numeric-owner
9
10=== modified file 'debian/changelog'
11--- debian/changelog 2012-10-04 18:43:50 +0000
12+++ debian/changelog 2012-10-12 19:19:22 +0000
13@@ -1,3 +1,10 @@
14+lxc (0.8.0~rc1-4ubuntu38) UNRELEASED; urgency=low
15+
16+ * ubuntu-cloud template: use --numeric-owner when extracting root filesystems
17+ with tar (LP: #1066084)
18+
19+ -- Scott Moser <smoser@ubuntu.com> Fri, 12 Oct 2012 15:17:16 -0400
20+
21 lxc (0.8.0~rc1-4ubuntu37) quantal; urgency=low
22
23 * update 0222-debian-dhcp3-package: use dhcp3-client, not server!
24
25=== added file 'debian/patches/0225-ubuntu-cloud-numeric-owner'
26--- debian/patches/0225-ubuntu-cloud-numeric-owner 1970-01-01 00:00:00 +0000
27+++ debian/patches/0225-ubuntu-cloud-numeric-owner 2012-10-12 19:19:22 +0000
28@@ -0,0 +1,20 @@
29+Description: ubuntu-cloud template: extract root tar with --numeric-owner
30+ when extracting the tarball of the filesystem it must be done with
31+ --numeric-owner. Without this argument, ownership is potentially
32+ broken because tar converts the username/groupname to uid/gid.
33+ this does not necessarily match the entries in /etc/passwd or group
34+ inside the extracted root.
35+Author: Scott Moser <smoser@ubuntu.com>
36+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/1066084
37+Forwarded: no
38+--- a/templates/lxc-ubuntu-cloud.in
39++++ b/templates/lxc-ubuntu-cloud.in
40+@@ -341,7 +341,7 @@ mkdir -p /var/lock/subsys/
41+ echo "Extracting container rootfs"
42+ mkdir -p $rootfs
43+ cd $rootfs
44+- tar -zxf $cache/$filename
45++ tar --numeric-owner -zxf $cache/$filename
46+
47+
48+ if [ $cloud -eq 0 ]; then
49
50=== modified file 'debian/patches/series'
51--- debian/patches/series 2012-10-04 17:08:11 +0000
52+++ debian/patches/series 2012-10-12 19:19:22 +0000
53@@ -105,3 +105,4 @@
54 0222-debian-dhcp3-package
55 0223-ubuntu-template-user-msg
56 0224-ubuntu-templates-devtmpfs
57+0225-ubuntu-cloud-numeric-owner
58
59=== modified file 'templates/lxc-ubuntu-cloud.in'
60--- templates/lxc-ubuntu-cloud.in 2012-10-04 17:08:11 +0000
61+++ templates/lxc-ubuntu-cloud.in 2012-10-12 19:19:22 +0000
62@@ -341,7 +341,7 @@
63 echo "Extracting container rootfs"
64 mkdir -p $rootfs
65 cd $rootfs
66- tar -zxf $cache/$filename
67+ tar --numeric-owner -zxf $cache/$filename
68
69
70 if [ $cloud -eq 0 ]; then

Subscribers

People subscribed via source and target branches