You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/03/25 16:45:49 UTC
ambari git commit: AMBARI-10201. Ambari-agent rpm install fails on
Centos7 (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 8d3da8ef2 -> 90a88c6aa
AMBARI-10201. Ambari-agent rpm install fails on Centos7 (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/90a88c6a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/90a88c6a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/90a88c6a
Branch: refs/heads/trunk
Commit: 90a88c6aab93717c9c498e5a10e46327ed1c6d2c
Parents: 8d3da8e
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Mar 25 17:45:42 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Mar 25 17:45:42 2015 +0200
----------------------------------------------------------------------
ambari-agent/conf/unix/install-helper.sh | 2 +-
ambari-agent/pom.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/90a88c6a/ambari-agent/conf/unix/install-helper.sh
----------------------------------------------------------------------
diff --git a/ambari-agent/conf/unix/install-helper.sh b/ambari-agent/conf/unix/install-helper.sh
index 75acab7..7c18b35 100644
--- a/ambari-agent/conf/unix/install-helper.sh
+++ b/ambari-agent/conf/unix/install-helper.sh
@@ -52,7 +52,7 @@ do_install(){
chmod 440 "$SUDOERS_FILE"
- grep '^#includedir /etc/sudoers.d$' /etc/sudoers
+ grep '^#includedir /etc/sudoers.d$' /etc/sudoers > /dev/null
if [ $? -ne 0 ] ; then
echo '#includedir /etc/sudoers.d' >> /etc/sudoers
fi
http://git-wip-us.apache.org/repos/asf/ambari/blob/90a88c6a/ambari-agent/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index ab07b9c..110a8d5 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -385,6 +385,7 @@
<directory>${sudoers.d.dir}</directory>
<username>root</username>
<groupname>root</groupname>
+ <directoryIncluded>false</directoryIncluded>
<sources>
<source>
<location>etc/sudoers.d</location>