aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rwxr-xr-xsh.Linux/init-early.sh5
-rw-r--r--src/rc.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 84ba6574..5a42bdea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
04 Aug 2007; Roy Marples <uberlord@gentoo.org>:
+ Boot properly when we cannot set an early font, #187628.
rc-update works again, #187487.
03 Aug 2007; Roy Marples <uberlord@gentoo.org>:
diff --git a/sh.Linux/init-early.sh b/sh.Linux/init-early.sh
index 3d2e2248..1bdf1fd4 100755
--- a/sh.Linux/init-early.sh
+++ b/sh.Linux/init-early.sh
@@ -10,6 +10,9 @@ if [ -e /etc/runlevels/"${RC_DEFAULTLEVEL}"/consolefont \
font="$(cat "${RC_LIBDIR}"/console/font)"
CONSOLE="${CONSOLE:-/dev/console}"
[ -c "${CONSOLE}" ] && cons="-C ${CONSOLE}"
- setfont ${cons} "${RC_LIBDIR}"/console/"${font}"
+ setfont ${cons} "${RC_LIBDIR}"/console/"${font}" 2>/dev/null
fi
fi
+
+# Ensure we exit 0 so the boot continues
+exit 0
diff --git a/src/rc.c b/src/rc.c
index cb13c850..f7c4f98a 100644
--- a/src/rc.c
+++ b/src/rc.c
@@ -671,7 +671,7 @@ static void run_script (const char *script) {
} while (! WIFEXITED (status) && ! WIFSIGNALED (status));
if (! WIFEXITED (status) || ! WEXITSTATUS (status) == 0)
- exit (EXIT_FAILURE);
+ eerrorx ("%s: failed to exec `%s'", applet, script);
}
#include "_usage.h"