emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Boot properly when we cannot set an early font, #187628.

Browse Source
This commit is contained in:
Roy Marples 2007-08-04 20:35:05 +00:00
parent 3e5526fd76
commit 1e4357ad01
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -5,6 +5,7 @@
04 Aug 2007; Roy Marples <uberlord@gentoo.org>: 04 Aug 2007; Roy Marples <uberlord@gentoo.org>:
Boot properly when we cannot set an early font, #187628.
rc-update works again, #187487. rc-update works again, #187487.
03 Aug 2007; Roy Marples <uberlord@gentoo.org>: 03 Aug 2007; Roy Marples <uberlord@gentoo.org>:

5
sh.Linux/init-early.sh
View File

@ -10,6 +10,9 @@ if [ -e /etc/runlevels/"${RC_DEFAULTLEVEL}"/consolefont \
font="$(cat "${RC_LIBDIR}"/console/font)" font="$(cat "${RC_LIBDIR}"/console/font)"
CONSOLE="${CONSOLE:-/dev/console}" CONSOLE="${CONSOLE:-/dev/console}"
[ -c "${CONSOLE}" ] && cons="-C ${CONSOLE}" [ -c "${CONSOLE}" ] && cons="-C ${CONSOLE}"
setfont ${cons} "${RC_LIBDIR}"/console/"${font}" setfont ${cons} "${RC_LIBDIR}"/console/"${font}" 2>/dev/null
fi fi
fi fi
# Ensure we exit 0 so the boot continues
exit 0

2
src/rc.c
View File

@ -671,7 +671,7 @@ static void run_script (const char *script) {
} while (! WIFEXITED (status) && ! WIFSIGNALED (status)); } while (! WIFEXITED (status) && ! WIFSIGNALED (status));
if (! WIFEXITED (status) || ! WEXITSTATUS (status) == 0) if (! WIFEXITED (status) || ! WEXITSTATUS (status) == 0)
exit (EXIT_FAILURE); eerrorx ("%s: failed to exec `%s'", applet, script);
} }
#include "_usage.h" #include "_usage.h"