瀏覽代碼

AMBARI-12870. Installing Ambari-2.1.0 removes /etc/sudoers.d/ambari-agent file (aonishuk)

Andrew Onishuk 10 年之前
父節點
當前提交
76990f4a8b
共有 2 個文件被更改,包括 5 次插入1 次删除
  1. 4 0
      ambari-agent/src/main/package/deb/control/preinst
  2. 1 1
      ambari-agent/src/main/package/rpm/preinstall.sh

+ 4 - 0
ambari-agent/src/main/package/deb/control/preinst

@@ -31,7 +31,11 @@ fi
 BAK=/etc/ambari-agent/conf/ambari-agent.ini.old
 BAK=/etc/ambari-agent/conf/ambari-agent.ini.old
 ORIG=/etc/ambari-agent/conf/ambari-agent.ini
 ORIG=/etc/ambari-agent/conf/ambari-agent.ini
 
 
+BAK_SUDOERS=/etc/sudoers.d/ambari-agent.bak
+ORIG_SUDOERS=/etc/sudoers.d/ambari-agent
+
 [ -f $ORIG ] && mv -f $ORIG $BAK
 [ -f $ORIG ] && mv -f $ORIG $BAK
+[ -f $ORIG_SUDOERS ] && echo "Moving $ORIG_SUDOERS to $BAK_SUDOERS. Please restore the file if you were using it for ambari-agent non-root functionality" && mv -f $ORIG_SUDOERS $BAK_SUDOERS
 
 
 if [ -d "$STACKS_FOLDER" ]
 if [ -d "$STACKS_FOLDER" ]
 then
 then

+ 1 - 1
ambari-agent/src/main/package/rpm/preinstall.sh

@@ -31,7 +31,7 @@ BAK_SUDOERS=/etc/sudoers.d/ambari-agent.bak
 ORIG_SUDOERS=/etc/sudoers.d/ambari-agent
 ORIG_SUDOERS=/etc/sudoers.d/ambari-agent
 
 
 [ -f $ORIG ] && mv -f $ORIG $BAK
 [ -f $ORIG ] && mv -f $ORIG $BAK
-[ -f $ORIG_SUDOERS ] && mv -f $ORIG_SUDOERS $BAK_SUDOERS
+[ -f $ORIG_SUDOERS ] && echo "Moving $ORIG_SUDOERS to $BAK_SUDOERS. Please restore the file if you were using it for ambari-agent non-root functionality" && mv -f $ORIG_SUDOERS $BAK_SUDOERS
 
 
 if [ -d "$STACKS_FOLDER" ]
 if [ -d "$STACKS_FOLDER" ]
 then
 then