[configs/releng] Replace rc.d/archiso with initscripts hooks.

In this way:
* Prepare locales requested by boot param mostly early possible.
* Setup special console at end of rc.sysinit

Remove unneded include from automated_script (already included by rc.conf)

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
This commit is contained in:
Gerardo Exequiel Pozzi 2011-08-17 20:26:17 -03:00
parent b16088ba7e
commit a9c02d9488
4 changed files with 15 additions and 26 deletions

View File

@ -30,4 +30,4 @@ USELVM="no"
HOSTNAME="archiso"
DAEMONS=(hwclock syslog-ng archiso)
DAEMONS=(hwclock syslog-ng)

View File

@ -1,5 +1,3 @@
. /etc/archiso/functions
automated_script ()
{
script="$(kernel_cmdline script)"

View File

@ -0,0 +1,11 @@
prepare_locale_gen ()
{
if [[ ${LOCALE} != "en_US.UTF-8" ]]; then
stat_busy "Generating locales..."
sed -i "s/#\(${LOCALE/[@.]*}\)/\1/" /etc/locale.gen
/usr/sbin/locale-gen > /dev/null
stat_done
fi
}
add_hook sysinit_postmount prepare_locale_gen

View File

@ -1,20 +1,6 @@
# vim: set ft=sh:
. /etc/rc.conf
. /etc/rc.d/functions
do_locale_gen ()
{
if [[ ${LOCALE} != "en_US.UTF-8" ]]; then
stat_busy "Generating locales..."
sed -i "s/#\(${LOCALE/[@.]*}\)/\1/" /etc/locale.gen
/usr/sbin/locale-gen > /dev/null
stat_done
fi
}
# If an alternate console was specified on the kernel command line,
# start agetty on it too.
do_special_console()
setup_special_console()
{
local cmdline_console
if cmdline_console=$(kernel_cmdline console); then
@ -24,7 +10,7 @@ do_special_console()
options=${cmdline_console#${port}}
options=${options#,}
baud=${options%%[neo]*}
[[ ${options} =~ r$ ]] && rts="-h"
[[ ${options} == *r ]] && rts="-h"
if ! grep -q "^${port}" /etc/securetty; then
echo ${port} >> /etc/securetty
fi
@ -36,10 +22,4 @@ do_special_console()
fi
}
case "$1" in
start)
do_locale_gen
do_special_console
;;
esac
exit 0
add_hook sysinit_end setup_special_console