From: Christian Limpach <Christian.Limpach@citrix.com>
Date: Thu, 14 Jan 2010 05:27:33 +0000 (+0000)
Subject: Discard script output by default.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8108ff925af86e7086427fb767efcf0e9988d774;p=xenclient%2Ftoolstack.git

Discard script output by default.
---

diff --git a/scripts/sec-change-pass b/scripts/sec-change-pass
index 8cafb1b..d37c73a 100755
--- a/scripts/sec-change-pass
+++ b/scripts/sec-change-pass
@@ -4,6 +4,10 @@ user="$1"
 userpass="$2"
 serverpass="$3"
 
+exec 3>&2
+[ -z "$V" ] && exec >/dev/null 2>&1
+err () { echo >&3 "$@"; }
+
 LVPREFIX=s-
 LVSIZE=12M
 VGNAME=xenclient
@@ -23,14 +27,14 @@ SECDM="s-${user}"
 
 cryptsetup -q -d "${TKEY}" \
   luksKillSlot "/dev/${VGNAME}/${LVPREFIX}${user}" 0 || {
-    echo $0: cryptsetup luksKillSlot failed: $?
+    err $0: cryptsetup luksKillSlot failed: $?
     rm "${TKEY}" "${UKEY}"
     exit 2
   }                       
 
 cryptsetup -q -d "${TKEY}" -S 0 \
   luksAddKey "/dev/${VGNAME}/${LVPREFIX}${user}" "${UKEY}" || {
-    echo $0: cryptsetup luksAddKey failed: $?
+    err $0: cryptsetup luksAddKey failed: $?
     rm "${TKEY}" "${UKEY}"
     exit 3
   }
diff --git a/scripts/sec-check-pass b/scripts/sec-check-pass
index d781238..f61c952 100755
--- a/scripts/sec-check-pass
+++ b/scripts/sec-check-pass
@@ -3,6 +3,10 @@
 user="$1"
 userpass="$2"
 
+exec 3>&2
+[ -z "$V" ] && exec >/dev/null 2>&1
+err () { echo >&3 "$@"; }
+
 LVPREFIX=s-
 VGNAME=xenclient
 DEVKEY=/config/sec/device.key
@@ -15,7 +19,7 @@ UKEY="${RAMDIR}/s-${user}.key"
 
 cryptsetup -d "${UKEY}" -S 0 \
   luksCheckKey "/dev/${VGNAME}/${LVPREFIX}${user}" || {
-  echo $0: cryptsetup luksCheckKey failed: $?
+  err $0: cryptsetup luksCheckKey failed: $?
   rm "${UKEY}"
   exit 2
 }
diff --git a/scripts/sec-mount b/scripts/sec-mount
index bc61b5e..cf0db7c 100755
--- a/scripts/sec-mount
+++ b/scripts/sec-mount
@@ -3,6 +3,10 @@
 user="$1"
 userpass="$2"
 
+exec 3>&2
+[ -z "$V" ] && exec >/dev/null 2>&1
+err () { echo >&3 "$@"; }
+
 LVPREFIX=s-
 VGNAME=xenclient
 DEVKEY=/config/sec/device.key
@@ -21,14 +25,14 @@ grep -q "${SECPATH}" /proc/mounts && \
 
 cryptsetup -d "${UKEY}" \
   luksOpen "/dev/${VGNAME}/${LVPREFIX}${user}" "${SECDM}" || {
-  echo $0: cryptsetup luksOpen failed: $?
+  err $0: cryptsetup luksOpen failed: $?
   rm "${UKEY}"
   exit 2
 }
 
 mkdir -p "${SECPATH}"
 mount "/dev/mapper/${SECDM}" "${SECPATH}" || {
-  echo $0: mount failed: $?
+  err $0: mount failed: $?
   cryptsetup luksClose "${SECDM}"
   rm "${UKEY}"
   exit 3
diff --git a/scripts/sec-new-user b/scripts/sec-new-user
index 767317d..1eec793 100755
--- a/scripts/sec-new-user
+++ b/scripts/sec-new-user
@@ -4,6 +4,10 @@ user="$1"
 userpass="$2"
 serverpass="$3"
 
+exec 3>&2
+[ -z "$V" ] && exec >/dev/null 2>&1
+err () { echo >&3 "$@"; }
+
 LVPREFIX=s-
 LVSIZE=12M
 VGNAME=xenclient
@@ -14,7 +18,7 @@ TKEY="${RAMDIR}/s-t-${user}.key"
 SECDM="s-${user}"
 
 lvcreate -L "${LVSIZE}" -n "${LVPREFIX}${user}" "${VGNAME}" || {
-  echo $0: lvcreate failed: $?
+  err $0: lvcreate failed: $?
   exit 2
 }
 
@@ -24,7 +28,7 @@ lvcreate -L "${LVSIZE}" -n "${LVPREFIX}${user}" "${VGNAME}" || {
 
 cryptsetup -q -S 0 \
   luksFormat "/dev/${VGNAME}/${LVPREFIX}${user}" "${UKEY}" || {
-  echo $0: cryptsetup luksFormat failed: $?
+  err $0: cryptsetup luksFormat failed: $?
   rm "${UKEY}"
   exit 3
 }
@@ -37,7 +41,7 @@ cryptsetup -q -S 0 \
  
   cryptsetup -q -S 1 -d "${UKEY}" \
     luksAddKey "/dev/${VGNAME}/${LVPREFIX}${user}" "${TKEY}" || {
-      echo $0: cryptsetup luksAddKey failed: $?
+      err $0: cryptsetup luksAddKey failed: $?
       rm "${TKEY}" "${UKEY}"
       exit 4
     }
@@ -47,20 +51,20 @@ cryptsetup -q -S 0 \
 
 cryptsetup -d "${UKEY}" \
   luksOpen "/dev/${VGNAME}/${LVPREFIX}${user}" "${SECDM}" || {
-  echo $0: cryptsetup luksOpen failed: $?
+  err $0: cryptsetup luksOpen failed: $?
   rm "${UKEY}"
   exit 5
 }
 
 mkfs.ext2 "/dev/mapper/${SECDM}" || {
-  echo $0: mkfs.ext2 failed: $?
+  err $0: mkfs.ext2 failed: $?
   cryptsetup luksClose "${SECDM}"
   rm "${UKEY}"
   exit 6
 }
 
 cryptsetup luksClose "${SECDM}" || {
-  echo $0: cryptsetup luksClose failed: $?
+  err $0: cryptsetup luksClose failed: $?
   rm "${UKEY}"
   exit 7
 }
diff --git a/scripts/sec-umount b/scripts/sec-umount
index 62c4efe..d7df5b7 100755
--- a/scripts/sec-umount
+++ b/scripts/sec-umount
@@ -2,18 +2,22 @@
 
 user="$1"
 
+exec 3>&2
+[ -z "$V" ] && exec >/dev/null 2>&1
+err () { echo >&3 "$@"; }
+
 SECDIR=/config/sec
 SECDM="s-${user}"
 SECPATH="${SECDIR}/s-${user}"
 
 umount "${SECPATH}" || {
-  echo $0: umount failed: $?
+  err $0: umount failed: $?
   cryptsetup luksClose "${SECDM}"
   exit 2
 }
 
 cryptsetup luksClose "${SECDM}" || {
-  echo $0: cryptsetup luksClose failed: $?
+  err $0: cryptsetup luksClose failed: $?
   exit 3
 }