. /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
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
langpart="${1%%_*}"
if [ "$1" != "C" ]; then
# Match the language code with 3rd field in languagelist
- line=$(grep -v "^#" /root/usr/share/live-initramfs/languagelist | cut -f3,4,5 -d\; | grep -v ';C$' | grep "^$langpart;")
+ line=$(grep -v "^#" /usr/share/live-initramfs/languagelist | cut -f3,4,5 -d\; | grep -v ';C$' | grep "^$langpart;")
if [ -n "$line" ]; then
if [ "$(echo "$line" | grep -c '')" -gt 1 ]; then
# More than one match; try matching the
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() {