X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-functions;h=6fb57c600f7c593e1ba2b1e1f68c58b1d7f8bc3d;hb=0b96ad9583351a7dae68711acf886298b1d25b63;hp=60721b4d08bede1ed9fb5fcc8730e38feb7e9c5a;hpb=9fc9e2a1a11b0edada38cb501fefe4f58aa414ac;p=live-boot-grml.git diff --git a/scripts/live-functions b/scripts/live-functions index 60721b4..6fb57c6 100644 --- a/scripts/live-functions +++ b/scripts/live-functions @@ -1,21 +1,42 @@ +#!/bin/sh . /scripts/functions +. /live.vars -# Override this so we don't call PROGRESS -log_end_msg() +log_end_msg () { - if [ -x /sbin/usplash_write ]; then + # Override this so we don't call PROGRESS + if [ -x /sbin/usplash_write ] + then /sbin/usplash_write "SUCCESS ok" fi + _log_msg "Done." } -# Print a message and wait for enter -log_wait_msg() +log_wait_msg () { - if [ -x /sbin/usplash_write ]; then - /sbin/usplash_write "INPUTENTER $@" + # Print a message and wait for enter + if [ -x /sbin/usplash_write ] + then + /sbin/usplash_write "INPUTENTER ${@}" read nunya < /dev/.initramfs/usplash_outfifo fi - _log_msg "Waiting: $@ ..." + + _log_msg "Waiting: ${@} ..." +} + +really_export () +{ + STRING="${1}" + VALUE="$(eval echo -n \${$STRING})" + + if [ -f /live.vars ] && cat /live.vars | grep -sq "export ${STRING}" + then + sed -i -e 's/\('${STRING}'=\).*$/\1'${VALUE}'/' /live.vars + else + echo "export ${STRING}=\"${VALUE}\"" >> /live.vars + fi + + eval export "${STRING}"="${VALUE}" }