summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDieter Plaetinck <dieter@plaetinck.be>2008-11-03 17:07:25 +0100
committerDieter Plaetinck <dieter@plaetinck.be>2008-11-03 17:07:25 +0100
commitd2e430228f61b78a31729654506af342f6e15703 (patch)
tree92d78af2d707072ffdef91be43e92d75bedf88b8
parent02238e00d76cd4b0a41ef7f7a062e7711b97cf69 (diff)
function for registered shutdown + tiny cleanup
-rw-r--r--src/core/procedures/interactive9
-rwxr-xr-xsrc/fifa.sh8
2 files changed, 11 insertions, 6 deletions
diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive
index 82b2d26..2c646bc 100644
--- a/src/core/procedures/interactive
+++ b/src/core/procedures/interactive
@@ -110,13 +110,10 @@ mainmenu()
"None" "\Zb\Z1Warning\Z0\ZB: you must install your own bootloader!" 2>$ANSWER
execute worker install_bootloader "`cat $ANSWER`";;
"7")
- echo ""
- echo "If the install finished successfully, you can now type 'reboot'"
- echo "to restart the system."
- echo ""
- exit 0 ;;
+ notify "If the install finished successfully, you can now type 'reboot' to restart the system."
+ stop_installer ;;
*)
- ask_yesno "Abort Installation?" && exit 0
+ ask_yesno "Abort Installation?" && stop_installer
;;
esac
}
diff --git a/src/fifa.sh b/src/fifa.sh
index dd08408..a5b7749 100755
--- a/src/fifa.sh
+++ b/src/fifa.sh
@@ -139,6 +139,14 @@ start_process ()
}
+# use this function to stop the installation procedure.
+# $1 exit code (optional)
+stop_installer ()
+{
+ log "-------------- STOPPING INSTALLATION ----------"
+ exit $1
+}
+
###### perform actual logic ######
echo "Welcome to $TITLE"