X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-functions;h=d19b0d5b21afbf4e79947a4a1a9bcec3fc24f25d;hb=1736a26b70a1af93c290cfa9f4e7b593b7554d22;hp=7028843ceb336798e7a0f241137909f91974f2b3;hpb=357ac91a9701e8a26648a293e0580129ba4a6cd5;p=live-boot-grml.git

diff --git a/scripts/live-functions b/scripts/live-functions
index 7028843..d19b0d5 100644
--- 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
@@ -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() {