better error output

diff --git a/arch-init b/arch-init
index b34c42894033e196f8e90822d8e3f84fec7b956c..d1c554268c3df48e39dafca3cbd0881443389436 100755 (executable)
--- a/arch-init
+++ b/arch-init
@@ -3,7 +3,7 @@
 # see t.org for how to call
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 cd $(dirname $(readlink -f "$BASH_SOURCE"))
 

diff --git a/arch-init-chroot b/arch-init-chroot
index 5e2f8aa6a5ef58c68b3fcd85345b33b546ce4381..6c9d66b673b0fa5f4526e141788364aab712ec1c 100755 (executable)
--- a/arch-init-chroot
+++ b/arch-init-chroot
@@ -1,6 +1,6 @@
 #!/bin/bash -x
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 for x in /etc/*.pacorig; do
     # This started breaking immediately when I stoped doing genfstab.

diff --git a/arch-init-remote b/arch-init-remote
index c82cd70838b053312f860bc826343a3991028479..3cf222cc77f4d1a2ad0bdeed4e038b5e1d6eb748 100755 (executable)
--- a/arch-init-remote
+++ b/arch-init-remote
@@ -3,7 +3,7 @@
 set -x
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 if [[ ! $1 ]]; then
     echo "error: expect a hostname in \$1 "

diff --git a/arch-pxe b/arch-pxe
index 03ec659949e17470d26951236cc3796dc15f10c4..56e479094cf2a6525b4835baab4e04c7b2d5d9a8 100755 (executable)
--- a/arch-pxe
+++ b/arch-pxe
@@ -4,7 +4,7 @@
 # Requires manually downloading image to /a/opt, and set it's name below.
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 cd /a/opt
 #iso="archlinux-2015.11.01-dual"

diff --git a/chboot b/chboot
index 0e3b506ebc7cdabe40c0cb3bd8d90eec41a93e3c..64e499ff484176dfbeaf98479bf5d3d9ddbf4dee 100755 (executable)
--- a/chboot
+++ b/chboot
@@ -7,7 +7,7 @@
 # DISTRO_NAME is based on the partition names in /boot. eg boot_debianjessie
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 [[ $EUID == 0 ]] || exec sudo "$BASH_SOURCE" "$@"
 

diff --git a/debian-preseed b/debian-preseed
index 86b4ffd6c212f58aee289036eeb24d6b914a1f54..98ee46c85785d0e817b07b1256904e46489a4746 100755 (executable)
--- a/debian-preseed
+++ b/debian-preseed
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 usage() {
     cat <<EOF

diff --git a/debian-pxe-preseed b/debian-pxe-preseed
index 52ca18f758c0f81d44ab79d7ca74444d802e3304..7be148b340314fcd1b7d27ef4c06e3ff1bbb65e9 100755 (executable)
--- a/debian-pxe-preseed
+++ b/debian-pxe-preseed
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 
 [[ $EUID == 0 ]] || exec sudo "$BASH_SOURCE" "$@"

diff --git a/fai-redep b/fai-redep
index 6a47fafc7cd1d83044d9ac3e85fe8da8eeee2048..cd0888737541a0d475d7de19df177b193ee3fbf2 100755 (executable)
--- a/fai-redep
+++ b/fai-redep
@@ -5,7 +5,7 @@ set -x
 # then start a virtual machine to test the config.
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 cd $(dirname $(readlink -f "$BASH_SOURCE"))
 

diff --git a/fai-revm b/fai-revm
index 87cf1cf90a01d1486be19c3d147b5738673a05e6..f7bf872baa6fb48ea5190ceac85bca9e7bfc3ed8 100755 (executable)
--- a/fai-revm
+++ b/fai-revm
@@ -6,7 +6,7 @@ set -x
 # then start a virtual machine to test the config.
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 redeploy=false
 if [[ $1 == -r ]]; then

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 266024652fabc5cbba1b5ea90833fd0c8af40262..9afbe912ed05c95fb734bcc595aec4040dc1b639 100755 (executable)
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -10,9 +10,9 @@ case $HOSTNAME in
     demohost)
         echo "FAIBASE DEBIAN DESKTOP STABLE" ;;
     x2)
-        echo "FAIBASE DEBIAN DESKTOP STABLE PARTITION_PROMPT" ;;
+        echo "FAIBASE DEBIAN DESKTOP PARTITION_PROMPT" ;;
     tp)
-        echo "FAIBASE DEBIAN DESKTOP STABLE PARTITION_PROMPT" ;;
+        echo "FAIBASE DEBIAN DESKTOP PARTITION_PROMPT" ;;
     frodo)
         echo "FAIBASE DEBIAN DESKTOP STABLE PARTITION_PROMPT" ;;
     # faiserver)

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index e6e182b82a82afbdc58aff3af9834574f8ac584d..7d83b20e3c7c58ae3760fa45c6615b40623b577a 100755 (executable)
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -1,7 +1,7 @@
 #!/bin/bash -x
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 
 

diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index 317eb6d3b9b149069fcc3b0f8fce4c94da0ef93c..c2b73cbc5f63217d83bde84187428a32231cd669 100755 (executable)
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -1,7 +1,7 @@
 #!/bin/bash -x
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 # # fai's setup-storage won't do btrfs on luks,
 # # so we do it ourself :)

diff --git a/fai/config/scripts/GRUB_PC/11-ian b/fai/config/scripts/GRUB_PC/11-ian
index 9764d8e5f10f5864f4eee7f67a1c3ce3cfce7e8f..bdfa275d85e424e7d9d1f505fc43654576a3a5f8 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -1,7 +1,7 @@
 #!/bin/bash -x
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 $ROOTCMD adduser --disabled-password --gecos ian ian
 

diff --git a/fai/config/scripts/LAST/50-misc b/fai/config/scripts/LAST/50-misc
index 25b6ce7e239bde45aa96af061dfcd133fe8fc919..11bafd52d33033b11c23113fb16de7b091cb13db 100755 (executable)
--- a/fai/config/scripts/LAST/50-misc
+++ b/fai/config/scripts/LAST/50-misc
@@ -15,13 +15,14 @@ else
     fi
   fi
 
-  usedm=$(dmsetup ls | egrep -v '^live-rw|^live-base|^No devices found' | wc -l)
-  if [ $usedm -ne 0 ]; then
-    if [ ! -d $target/etc/lvm ]; then
-       echo ERROR: Found lvm devices, but the lvm2 package was not installed
-       error=1
-    fi
-  fi
+  # # commented because it does false possitive
+  # usedm=$(dmsetup ls | egrep -v '^live-rw|^live-base|^No devices found' | wc -l)
+  # if [ $usedm -ne 0 ]; then
+  #   if [ ! -d $target/etc/lvm ]; then
+  #       echo ERROR: Found lvm devices, but the lvm2 package was not installed
+  #       error=1
+  #   fi
+  # fi
 fi
 
 # remove backup files from cfengine, but only if cfengine is installed

diff --git a/faiserver-revm b/faiserver-revm
index c7f82b868e290818ab6cc77607c2664c870d41ae..f546accd3238df6166c94e5ee83d2150660ef490 100755 (executable)
--- a/faiserver-revm
+++ b/faiserver-revm
@@ -2,7 +2,7 @@
 set -x
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 cd $(dirname $(readlink -f "$BASH_SOURCE"))
 

diff --git a/faiserver-setup b/faiserver-setup
index d507f0b3a56b4361eafcb6c9be19fe1fd3d9bb88..1bfbacb547e18f00fc2dd50da79f1f5615a029d8 100755 (executable)
--- a/faiserver-setup
+++ b/faiserver-setup
@@ -3,7 +3,7 @@
 # initial setup of a fai server on debian
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 [[ $EUID == 0 ]] || exec sudo "${BASH_SOURCE}" "$@"
 

diff --git a/faiserver-uninstall b/faiserver-uninstall
index 4a9976da0e19fe7943a990ddf69906588004cab1..fbf3bd850503db21e658b3865b868dc29111a1f9 100755 (executable)
--- a/faiserver-uninstall
+++ b/faiserver-uninstall
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 [[ $EUID == 0 ]] || exec sudo "${BASH_SOURCE}" "$@"
 

diff --git a/fresize b/fresize
index 7a6688f2d127b29ff244275463368ec1fd2ad47f..68c12bd129de1e24acf2fd38436ad16d23d70aee 100755 (executable)
--- a/fresize
+++ b/fresize
@@ -195,7 +195,7 @@ while read devid dev; do
                 cat >/root/finish-resize <<'EOF'
 #!/bin/bash -x
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 EOF
                 chmod +x /root/finish-resize
             fi

diff --git a/pxe-server b/pxe-server
index 6d2411ee5460d713b8a7ededdbdeaccef234e6c3..1664253761ae818d846d07521291214a0a42f64b 100755 (executable)
--- a/pxe-server
+++ b/pxe-server
@@ -7,7 +7,7 @@
 # default distro is the base debian/fedora type. others are fai &  arch
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 if [[ ! $1 ]]; then
     echo "$0: error: exptected 1 argument of type"

diff --git a/wrt-setup b/wrt-setup
index 0c9fb29d5dce9c86b76551894d6808ad09c14fe6..2362a3313a3f8b36a5f56f373b398cb219c62aa7 100755 (executable)
--- a/wrt-setup
+++ b/wrt-setup
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 
 # ssh

diff --git a/wrt-setup-remote b/wrt-setup-remote
index ccd96c4ee9f3f783ce48756dbe8831c2c8a03132..12f65673433294436ce3dc8b59c40bc123fc0d34 100755 (executable)
--- a/wrt-setup-remote
+++ b/wrt-setup-remote
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 h=root@192.168.1.1
 scp /a/bin/fai/wrt-setup /a/bin/bash-programs-by-ian/repos/cedit/cedit $h:/usr/bin