Two return code consistency fix.

[live-boot-grml.git] / scripts / live-functions

diff --git a/scripts/live-functions b/scripts/live-functions
index 7028843..8bf9c38 100644 (file)
--- a/scripts/live-functions
+++ b/scripts/live-functions
@@ -2,47 +2,6 @@
 . /scripts/functions
 . /live.vars
 
-# Override log_*_msg until #494257 is merged
-
-_log_msg()
-{
-       if [ "$quiet" = "y" ]; then return; fi
-       printf "$@"
-}
-
-log_success_msg()
-{
-       _log_msg "Success: $@\n"
-}
-
-log_failure_msg()
-{
-       _log_msg "Failure: $@\n"
-}
-
-log_warning_msg()
-{
-       _log_msg "Warning: $@\n"
-}
-
-log_begin_msg()
-{
-       if [ -x /sbin/usplash_write ]; then
-               /sbin/usplash_write "TEXT $@"
-       fi
-       _log_msg "Begin: $@ ... "
-}
-
-log_end_msg()
-{
-       if [ -x /sbin/usplash_write ]; then
-               /sbin/usplash_write "SUCCESS ok"
-       fi
-       _log_msg "done.\n"
-}
-
-##
-
 log_wait_msg ()
 {
        # Print a message and wait for enter
@@ -62,7 +21,7 @@ really_export ()
        STRING="${1}"
        VALUE="$(eval echo -n \${$STRING})"
 
-       if [ -f /live.vars ] && cat /live.vars | grep -sq "export ${STRING}"
+       if [ -f /live.vars ] && grep -sq "export ${STRING}" /live.vars
        then
                sed -i -e 's/\('${STRING}'=\).*$/\1'${VALUE}'/' /live.vars
        else
@@ -101,6 +60,16 @@ lang2locale() {
        fi
 }
 
+# Override maybe_break from scripts/functions
+maybe_break()
+{
+       if [ "${break}" = "$1" ]; then
+               # Call original panic
+               . /scripts/functions
+               panic "Spawning shell within the initramfs"
+       fi
+}
+
 # Override panic from scripts/functions
 panic() {