prologue.m4: Fix exit statuses.

Exit 1 if installation failed but restoration of the previous state
succeeded; exit 2 if things are now buggered.

diff --git a/prologue.m4 b/prologue.m4
index 9f5d08451bbfc0395f8f0e9800855981d7f8b811..a90e305f9d76c91617f5a534d44d295827a96654 100644 (file)
--- a/prologue.m4
+++ b/prologue.m4
@@ -35,17 +35,17 @@ revert () {
     if iptables-restore </var/run/firewall.save &&
        ip6tables-restore </var/run/firewall6.save; then
       echo "Previous firewall state restored."
     if iptables-restore </var/run/firewall.save &&
        ip6tables-restore </var/run/firewall6.save; then
       echo "Previous firewall state restored."

-      return
+      exit 1

     else
       echo "Failed!  Falling back to plan B."
     fi
   fi
   if ! "$1" revert; then
     echo >&2 "Safe firewall failed.  You're screwed.  Good luck."
     else
       echo "Failed!  Falling back to plan B."
     fi
   fi
   if ! "$1" revert; then
     echo >&2 "Safe firewall failed.  You're screwed.  Good luck."

-    exit 1
+    exit 2

   fi
   echo >&2 "Phew!  Fallback to safe version successful."
   fi
   echo >&2 "Phew!  Fallback to safe version successful."

-  exit 1
+  exit 2

 }
 
 finished () {
 }
 
 finished () {


@@ -116,7 +116,7 @@ case "$#,${1-update}" in
     if ! (try "$firewall_script" "$0"); then
       echo "FAILED."
       cat "$0.errors" >&2
     if ! (try "$firewall_script" "$0"); then
       echo "FAILED."
       cat "$0.errors" >&2

-      exit
+      exit 1

     fi
     echo "done."
     echo "Can you hear me?"
     fi
     echo "done."
     echo "Can you hear me?"