X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-functions;h=01350e8b253f4967aaf5ebd8a6955dab191f103a;hb=1d4b3c057dc2588bb54e5063b20275d907ba130d;hp=d86a3f6c71f32974fd2b9a724c0e535f10d2a341;hpb=4e024dff26b33878ca7ef61fc108fc2de7d5c4cb;p=live-boot-grml.git diff --git a/scripts/live-functions b/scripts/live-functions index d86a3f6..01350e8 100644 --- a/scripts/live-functions +++ b/scripts/live-functions @@ -3,6 +3,47 @@ . /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 @@ -12,7 +53,7 @@ log_wait_msg () read nunya < /dev/.initramfs/usplash_outfifo fi - _log_msg "Waiting: ${@} ..." + _log_msg "Waiting: ${@} ... \n" } really_export ()