Fix /var/lib/neutron and /var/lib/neutron/dhcp folder rights.

Change-Id: If0f2ab1ad50d12dc9af155314b962cbc25052167
(cherry picked from commit 619a80f61fbf5a65234ea2684952abb8cc991f3e)

Conflicts:
	debian/neutron-common.postinst.in

Rewritten-From: ced2f4baa8f89b915a9128c6fb6e52f801217be0

diff --git a/trusty/debian/neutron-common.postinst.in b/trusty/debian/neutron-common.postinst.in
index e3aac0b10f77bc3daf5a7989ac81feeaba8f3335..d153810c1c081f10633bd07fb01493ed350b6dbf 100644 (file)
--- a/trusty/debian/neutron-common.postinst.in
+++ b/trusty/debian/neutron-common.postinst.in
@@ -116,12 +116,12 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
        chown root:root /etc/neutron/rootwrap.conf
        chown root:root /etc/neutron/rootwrap.d
        chmod 0755 /etc/neutron/rootwrap.d
-       if dpkg-vendor --derives-from ubuntu ; then
-               mkdir -p /var/lib/neutron/dhcp
-               chmod 755 /var/lib/neutron
-               chown neutron:neutron /var/lib/neutron/dhcp
-               chmod 755 /var/lib/neutron/dhcp
-       fi
+
+       # The /var/lib/neutron/dhcp needs to be readable from the nobody user.
+       chmod 755 /var/lib/neutron
+       mkdir -p /var/lib/neutron/dhcp
+       chown neutron:neutron /var/lib/neutron/dhcp
+       chmod 755 /var/lib/neutron/dhcp
 
        if [ -f /etc/sudoers.d/neutron_sudoers ] ; then
                chmod 0440 /etc/sudoers.d/neutron_sudoers