Code Review
/
openstack-build
/
cinder-build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
spec file update for rpm, deb
[openstack-build/cinder-build.git]
/
debian
/
cinder-common.postinst
diff --git
a/debian/cinder-common.postinst
b/debian/cinder-common.postinst
index 3443c56fa6c0aadeccfadde7b0088cb12e87d0c8..8045dbffb5afd52d18908d4bfcddf3470f23fd55 100644
(file)
--- a/
debian/cinder-common.postinst
+++ b/
debian/cinder-common.postinst
@@
-1,11
+1,11
@@
#!/bin/sh -e
if [ "$1" = "configure" ]; then
#!/bin/sh -e
if [ "$1" = "configure" ]; then
- if ! geten
v
group cinder > /dev/null 2>&1; then
+ if ! geten
t
group cinder > /dev/null 2>&1; then
addgroup --system cinder >/dev/null
fi
addgroup --system cinder >/dev/null
fi
- if ! geten
v
passwd cinder > /dev/null 2>&1; then
+ if ! geten
t
passwd cinder > /dev/null 2>&1; then
adduser --system --home /var/lib/cinder --ingroup cinder --no-create-home \
--shell /bin/false cinder
fi
adduser --system --home /var/lib/cinder --ingroup cinder --no-create-home \
--shell /bin/false cinder
fi
@@
-19,7
+19,8
@@
if [ "$1" = "configure" ]; then
chmod 0755 /etc/cinder/rootwrap.d
chown root:root /etc/cinder/rootwrap.conf
chmod 0755 /etc/cinder/rootwrap.d
chown root:root /etc/cinder/rootwrap.conf
- if ! grep -q sql_connection /etc/cinder/cinder.conf
+ if ! grep -qE "^(sql_)?connection.*" /etc/cinder/cinder.conf || \
+ grep -qE "^(sql_)?connection.*sqlite.*" /etc/cinder/cinder.conf
then
su -s /bin/sh -c 'cinder-manage db sync' cinder
fi
then
su -s /bin/sh -c 'cinder-manage db sync' cinder
fi