From: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date: Wed, 10 Aug 2016 22:11:32 +0000 (+0900)
Subject: fix requiretty check, use 'sudo -l'
X-Git-Tag: colorado.1.0~166^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F01%2F18501%2F1;p=releng.git

fix requiretty check, use 'sudo -l'

A normal user doesn't have a right to read /etc/sudoers, so current
script won't work if executed by non-root users.

This patch replacing the check by geeting config from 'sudo -l'
command.

Change-Id: I608edabb73761cea0f6199045f1cde2217a34bf3
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
---

diff --git a/utils/jenkins-jnlp-connect.sh b/utils/jenkins-jnlp-connect.sh
index d268a28de..8dcaf35c5 100755
--- a/utils/jenkins-jnlp-connect.sh
+++ b/utils/jenkins-jnlp-connect.sh
@@ -49,8 +49,8 @@ main () {
     fi
 
     if [[ $(whoami) != "root" ]]; then
-      if grep "^Defaults requiretty" /etc/sudoers
-        then echo "please comment out Defaults requiretty from /etc/sudoers"
+      if sudo -l | grep "requiretty"; then
+        echo "please comment out Defaults requiretty from /etc/sudoers"
         exit 1
       fi
     fi