From 4befb600ef1516c0813d99359498a40a37c19d86 Mon Sep 17 00:00:00 2001
From: Yigang Wen <yigangx.wen@intel.com>
Date: Mon, 14 Jan 2013 17:11:19 +0800
Subject: [PATCH] modify depanneur_sudo and sudoers configure

* data/depanneur_sudo only support commands in depanneur:
  sudo "umount"|"mount"|"-E"|"mkdir"|"cp"|"rm"|"echo"
* date/gbs remove "Defaults targetpw" avoid inputing root passwd
  on ubuntu while using sudo xxx

Change-Id: Iebefe369e9ed5143d8b2e6e9f130e57ca8fce7be
---
 data/depanneur_sudo | 18 +++++++++++++++++-
 data/gbs            |  1 -
 depanneur           |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/data/depanneur_sudo b/data/depanneur_sudo
index 5095f5a..b0ac311 100755
--- a/data/depanneur_sudo
+++ b/data/depanneur_sudo
@@ -1,2 +1,18 @@
 #!/bin/bash
-sudo $@
+
+if [ -z "$1" ]
+then
+    echo "command must be specified for $0"
+    exit 1
+fi
+
+case $1 in
+    #commands need sudo in depanneur
+    umount|mount|mkdir|cp|rm|echo|*/usr/bin/build)
+        sudo "$@"
+        ;;
+     * )
+        echo "Don't support executing '$1' using $0"
+        exit 1
+        ;;
+esac
diff --git a/data/gbs b/data/gbs
index 61780ed..8ce227c 100644
--- a/data/gbs
+++ b/data/gbs
@@ -1,4 +1,3 @@
-Defaults targetpw
 ALL     ALL=(ALL) NOPASSWD:/usr/bin/depanneur_sudo
 
 Defaults env_keep += "http_proxy"
diff --git a/depanneur b/depanneur
index 728df94..d394d8c 100755
--- a/depanneur
+++ b/depanneur
@@ -1066,7 +1066,7 @@ sub build_package {
     if ($TERM == 1) {
         return -1;
     }
-    push @args, "sudo depanneur_sudo -E $virtualenv/usr/bin/build";
+    push @args, "sudo depanneur_sudo $virtualenv/usr/bin/build";
     if ($arch ne "i586" ) {
         push @args, "--use-system-qemu";
     }
-- 
2.7.4