Improve error handling

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --git a/common-functions.sh b/common-functions.sh
index de838bd44bd97f0cf1eaad4318d6780e945e48d6..937e2ae2fb5b1710d041e350c1b4c8271cd44749 100644 (file)
--- a/common-functions.sh
+++ b/common-functions.sh
@@ -114,10 +114,10 @@ function start_initscripts() {
         fi
         case $DISTRO in
             "Debian" )
-            $SUDO update-rc.d $1 defaults
+            $SUDO update-rc.d $1 defaults || echo "Couldn't set $1 to start"
             ;;
             "Fedora" )
-            $SUDO chkconfig --add $1
+            $SUDO chkconfig --add $1 || echo "Couldn't set $1 to start"
             ;;
             * )
             echo "I don't know how to start initscripts on $DISTRO"

diff --git a/grub.sh b/grub.sh
index 80117f6692e04065ea6351b9b059d094999796dd..a3831c426a7bb8d689caa6999556055275926ecf 100644 (file)
--- a/grub.sh
+++ b/grub.sh
@@ -30,6 +30,7 @@ function grub_install_dependencies() {
 function grub_build() {
     grub_install_dependencies
 
+    rm -f memdisk.tar
     tar cf memdisk.tar grub.cfg
     ./git-checkout.sh $GRUB_UPSTREAM_URL $GRUB_UPSTREAM_REVISION grub-dir
     cd grub-dir

diff --git a/libvirt.sh b/libvirt.sh
index 6cc4ee0196aead0717234aa43eb3463efb642e7a..45872aba4a2837edc031b741efefc9e0890a6894 100644 (file)
--- a/libvirt.sh
+++ b/libvirt.sh
@@ -39,9 +39,10 @@ function libvirt_build() {
         --without-parallels --without-test --with-libvirtd --without-sasl \
         --with-yajl --without-macvtap --without-avahi  --prefix=$PREFIX
     $MAKE
-    $MAKE --ignore-errors install DESTDIR="$INST_DIR"
+    $MAKE --ignore-errors install DESTDIR="$INST_DIR" || true
     if test $DISTRO = "Debian"
     then
+        mkdir -p "$INST_DIR"/etc/init.d
         cat ../libvirt.debian.init | sed -e "s,@PREFIX,$PREFIX,g" > "$INST_DIR"/etc/init.d/libvirtd
         chmod +x "$INST_DIR"/etc/init.d/libvirtd
     elif test $DISTRO = "Fedora" || test $DISTRO = "CentOS"

diff --git a/raise.sh b/raise.sh
index 1380c3a5b930c90e94b88c0c85d0f8da36fc6ead..4c50ceb21d28e21a90b11ddb5b5f656f53e52ebf 100755 (executable)
--- a/raise.sh
+++ b/raise.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -e
+
 source config
 source common-functions.sh
 
@@ -90,10 +92,10 @@ then
 fi
 # install under /
 TMPFILE=`mktemp`
-cd $INST_DIR
+cd "$INST_DIR"
 find . > $TMPFILE
-$SUDO mv $TMPFILE /var/log/raisin.log
-$SUDO cp -ar * /
+$SUDO mv -f $TMPFILE /var/log/raisin.log
+$SUDO cp -ar * / || true
 
 # configure
 if test "$XEN_UPSTREAM_REVISION"
@@ -109,4 +111,4 @@ then
     libvirt_configure
 fi
 
-rm -rf $INST_DIR
+rm -rf "$INST_DIR"

diff --git a/xen.sh b/xen.sh
index d4969ec12ccd0b1f3b5b1da6a13ca18c03f4e40a..624eafef125d60a07ac6fe07740f49fe1564847b 100644 (file)
--- a/xen.sh
+++ b/xen.sh
@@ -65,8 +65,7 @@ function xen_create_bridge_Debian() {
     echo "" >> $TMPFILE
     echo "iface $BRIDGE inet dhcp" >> $TMPFILE
     echo "    bridge_ports $IFACE" >> $TMPFILE
-    $SUDO cp $TMPFILE /etc/network/interfaces
-    rm $TMPFILE
+    $SUDO mv -f $TMPFILE /etc/network/interfaces
 }
 
 function xen_create_bridge_Fedora() {