use cmd_sudo
authorTero Marttila <terom@paivola.fi>
Wed, 01 Feb 2012 15:53:27 +0200
changeset 30 574ac60e5a4b
parent 29 3510040c7090
child 31 d33e971fd25e
use cmd_sudo
lib/lib.sh
pkvlm-create
--- a/lib/lib.sh	Wed Feb 01 15:46:55 2012 +0200
+++ b/lib/lib.sh	Wed Feb 01 15:53:27 2012 +0200
@@ -68,6 +68,13 @@
     cmd "$@"
 }
 
+function cmd_sudo () {
+    [ $CMD_PROMPT ] && read -p "Confirm: sudo: $* ? "
+
+    cmd sudo -- "$@"
+}
+
+
 function expand_MB () {
     local size=${1^}
 
@@ -104,7 +111,7 @@
     }
 
     # loop-mount
-    cmd sudo mount -o loop $iso $mnt || cleanup 1
+    cmd_sudo mount -o loop $iso $mnt || cleanup 1
 
     # copy
     cmd cp -rd $mnt $dst || cleanup 1
--- a/pkvlm-create	Wed Feb 01 15:46:55 2012 +0200
+++ b/pkvlm-create	Wed Feb 01 15:53:27 2012 +0200
@@ -731,7 +731,7 @@
 
     ## Disk
     # Create LV (unless it already exists)
-    [ -e $DISK_PATH ] || cmd_confirm sudo $LVM lvcreate -L $DISK_SIZE -n $DISK_NAME $DISK_VG
+    [ -e $DISK_PATH ] || cmd_sudo $LVM lvcreate -L $DISK_SIZE -n $DISK_NAME $DISK_VG
 
     ## SELinux?
     #$SEMANAGE fcontext -a -t virt_image_t $DISK