]> xenbits.xensource.com Git - people/liuw/rumprun.git/commitdiff
require -S for automated sudo
authorAntti Kantee <pooka@iki.fi>
Thu, 23 Apr 2015 11:53:03 +0000 (11:53 +0000)
committerAntti Kantee <pooka@iki.fi>
Thu, 23 Apr 2015 11:53:03 +0000 (11:53 +0000)
app-tools/rumprun

index 799d69c148c3e44c2bc4f4487d80f45be911b7f0..d4bbff6744e8be81ce67c7ac45ed6eb592aa833e 100755 (executable)
@@ -42,7 +42,7 @@ err()
        exit 1
 }
 
-myoptstr='n:b:e:pidD:N:M:'
+myoptstr='n:b:e:pidD:N:M:S'
 
 usage()
 {
@@ -165,6 +165,7 @@ run_xen()
        opt_mem=64
        opt_name=
        opt_debug=
+       opt_cansudo=false
        sudo=''
        while getopts "${myoptstr}" opt; do
                case "$opt" in
@@ -239,6 +240,9 @@ run_xen()
                        opt_debug=${OPTARG}
                        opt_pause=1
                        ;;
+               S)
+                       opt_cansudo=true
+                       ;;
                *)
                        usage
                        ;;
@@ -268,7 +272,7 @@ extra="$@"
 ${conf_vif}
 ${conf_disk}
 EOM
-       if [ $(id -u) -ne 0 ]; then
+       if ${opt_cansudo} && [ $(id -u) -ne 0 ]; then
                sudo='sudo'
        fi
 
@@ -327,6 +331,9 @@ run_qemu()
                        opt_debug="-gdb tcp::${OPTARG}"
                        opt_pause="-S"
                        ;;
+               S)
+                       # ignored for now
+                       ;;
                *)
                        err qemu stack like zathras: not so good
                        ;;