From bf5f66671aa41a982d738b19480f1e308e56a576 Mon Sep 17 00:00:00 2001 From: Tom Barron Date: Tue, 29 Nov 2016 16:32:08 -0500 Subject: [PATCH] Fix devstack smb configuration outside ubuntu Some distros ship with /etc/samba/smb.conf already in place, without /usr/share/samba/smb.conf. Only copy /etc/samba/smb.conf from /usr/share/samba/smb.conf if /usr/share/samba/smb.conf exists. Change-Id: I22aeed317a94774ff03c1aadf6a65f5edb490837 Fixes-bug: 1645860 (cherry picked from commit 6a211b7cf5e4200a0d2358c10bc83859578ebf1b) --- devstack/plugin.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 04a9d69b24..d94d05146d 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -715,7 +715,9 @@ function configure_samba { sudo service $samba_daemon_name restart || echo "Couldn't restart '$samba_daemon_name' service" fi - sudo cp /usr/share/samba/smb.conf $SMB_CONF + if [[ -e /usr/share/samba/smb.conf ]]; then + sudo cp /usr/share/samba/smb.conf $SMB_CONF + fi sudo chown $STACK_USER -R /etc/samba iniset $SMB_CONF global include registry iniset $SMB_CONF global security user