X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-functions;h=baa920c7660663c966a7cca4c0c2466f87f88560;hb=cb896241d0ec8eb2bba0cecd11de3500869176a6;hp=60721b4d08bede1ed9fb5fcc8730e38feb7e9c5a;hpb=d70b77f919f85511936645abb95d710b80c10c74;p=live-boot-grml.git diff --git a/scripts/live-functions b/scripts/live-functions index 60721b4..baa920c 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 + # 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: $@ ..." } + +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}" +}