3 files changed, 14 insertions, 25 deletions
diff --git a/configs/releng/root-image/etc/rc.d/functions.d/automated_script b/configs/releng/root-image/etc/rc.d/functions.d/automated_script
index edb8ea3..7a35acb 100644
--- a/configs/releng/root-image/etc/rc.d/functions.d/automated_script
+++ b/configs/releng/root-image/etc/rc.d/functions.d/automated_script
@@ -1,5 +1,3 @@
-. /etc/archiso/functions
-
 automated_script ()
 {
     script="$(kernel_cmdline script)"
diff --git a/configs/releng/root-image/etc/rc.d/functions.d/prepare_locale_gen b/configs/releng/root-image/etc/rc.d/functions.d/prepare_locale_gen
new file mode 100644
index 0000000..47ed79d
--- /dev/null
+++ b/configs/releng/root-image/etc/rc.d/functions.d/prepare_locale_gen
@@ -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
diff --git a/configs/releng/root-image/etc/rc.d/archiso b/configs/releng/root-image/etc/rc.d/functions.d/setup_special_console
index cc930f6..7badfe3 100755..100644
--- a/configs/releng/root-image/etc/rc.d/archiso
+++ b/configs/releng/root-image/etc/rc.d/functions.d/setup_special_console
@@ -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