From 3bea7d156d2c8e624d497b1a68efbfc2c379a26f Mon Sep 17 00:00:00 2001 From: Sofer Athlan-Guyot Date: Wed, 6 Dec 2017 07:54:19 +0100 Subject: [PATCH] Fix wrong path in ssh selinux issue detection. I also make sure that if grep fail it doesn't make the whole installation fails. Change-Id: Ib5873383632a1141c8dd3859b34ca29904020790 Closes-Bug: #1736246 --- .../os-refresh-config/post-configure.d/98-undercloud-setup | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/elements/undercloud-install/os-refresh-config/post-configure.d/98-undercloud-setup b/elements/undercloud-install/os-refresh-config/post-configure.d/98-undercloud-setup index 0b600562f..67bdfd33e 100755 --- a/elements/undercloud-install/os-refresh-config/post-configure.d/98-undercloud-setup +++ b/elements/undercloud-install/os-refresh-config/post-configure.d/98-undercloud-setup @@ -27,7 +27,9 @@ cat /root/.ssh/id_rsa.pub >> /root/.ssh/authorized_keys if [ -e /usr/sbin/getenforce ]; then if [ "$(getenforce)" == "Enforcing" ]; then - selinux_wrong_permission="$(find /home/.ssh/ -exec ls -lZ {} \; | grep -v 'ssh_home_t')" + set +x + selinux_wrong_permission="$(find /root/.ssh/ -exec ls -lZ {} \; | grep -v 'ssh_home_t')" + set -x if [ -n "${selinux_wrong_permission}" ]; then semanage fcontext -a -t ssh_home_t '/root/.ssh(/.*)?' restorecon -R /root/.ssh/