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

diff --git a/data/depanneur_sudo b/data/depanneur_sudo
index 5095f5a6ddf0667aad3f35f5aa6d7c67c2209ce0..b0ac31139717d5fd03b54d3cb811e2e6f80e2cda 100755 (executable)
--- 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 61780edf16f4872267426509f5d0eedf75eccdb2..8ce227c379bb49979d5c8a1b29a97ac5a6a06ac5 100644 (file)
--- 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 728df94f23d405c223e5dcd8ccdd2126d45afd09..d394d8cda4d13ee5964135c25786761c940a70de 100755 (executable)
--- 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";
     }