Merge lp:~gandelman-a/ubuntu/precise/glance/902429 into lp:~ubuntu-server-dev/glance/essex

Proposed by Adam Gandelman on 2011-12-10
Status: Merged
Merged at revision: 88
Proposed branch: lp:~gandelman-a/ubuntu/precise/glance/902429
Merge into: lp:~ubuntu-server-dev/glance/essex
Diff against target: 26 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/glance.postinst (+1/-1)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/precise/glance/902429
Reviewer Review Type Date Requested Status
Scott Moser 2011-12-10 Pending
Review via email: mp+85213@code.launchpad.net

Description of the change

Glance's shell was changed to /bin/false. Upstart jobs were modified by the 'glance db sync' command in postinst was missed.

To post a comment you must log in.
Scott Moser (smoser) wrote :

This looks good to me.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-12-09 20:34:35 +0000
3+++ debian/changelog 2011-12-10 05:58:23 +0000
4@@ -1,3 +1,10 @@
5+glance (2012.1~e2~20111209.1132-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * debian/glance.postinst: Specify shell when migrating sqllite
8+ database as glance user. (LP: #902429)
9+
10+ -- Adam Gandelman <adamg@canonical.com> Fri, 09 Dec 2011 20:44:23 -0800
11+
12 glance (2012.1~e2~20111209.1132-0ubuntu1) precise; urgency=low
13
14 * debian/glance.postinst, debian/glance.glance-api.upstart,
15
16=== modified file 'debian/glance.postinst'
17--- debian/glance.postinst 2011-12-08 16:24:22 +0000
18+++ debian/glance.postinst 2011-12-10 05:58:23 +0000
19@@ -19,7 +19,7 @@
20
21 if ! grep sql_connection /etc/glance/glance-registry.conf | grep -qv "sql_connection = sqlite:////var/lib/glance/glance.sqlite"
22 then
23- su -c 'glance-manage db_sync' glance
24+ su -s /bin/sh -c 'glance-manage db_sync' glance
25 fi
26 fi
27

Subscribers

People subscribed via source and target branches