diff options
Diffstat (limited to 'configs/releng/root-image/etc/rc.d')
| -rwxr-xr-x | configs/releng/root-image/etc/rc.d/archiso | 19 | ||||
| -rw-r--r-- | configs/releng/root-image/etc/rc.d/functions.d/omit_kill_nbd_client | 8 |
2 files changed, 14 insertions, 13 deletions
diff --git a/configs/releng/root-image/etc/rc.d/archiso b/configs/releng/root-image/etc/rc.d/archiso index 9d11d16..68e8375 100755 --- a/configs/releng/root-image/etc/rc.d/archiso +++ b/configs/releng/root-image/etc/rc.d/archiso @@ -2,20 +2,14 @@ . /etc/rc.conf . /etc/rc.d/functions -do_makeuser () -{ - stat_busy "Making the default user libre" - addgroups="audio,disk,optical,wheel" - useradd -m -p "" -g users -G $addgroups libre - stat_done -} - do_locale_gen () { - stat_busy "Generating locales..." - sed -i "s/#\(${LOCALE/[@.]*}\)/\1/" /etc/locale.gen - /usr/sbin/locale-gen > /dev/null - stat_done + 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, @@ -41,7 +35,6 @@ do_special_console() case "$1" in start) do_locale_gen - do_makeuser do_special_console ;; esac diff --git a/configs/releng/root-image/etc/rc.d/functions.d/omit_kill_nbd_client b/configs/releng/root-image/etc/rc.d/functions.d/omit_kill_nbd_client new file mode 100644 index 0000000..b72f168 --- /dev/null +++ b/configs/releng/root-image/etc/rc.d/functions.d/omit_kill_nbd_client @@ -0,0 +1,8 @@ +if [[ -f /run/nbd_client.pid ]]; then + omit_kill_nbd_client() { + add_omit_pids $(< /run/nbd_client.pid) + } + + add_hook shutdown_prekillall omit_kill_nbd_client + add_hook single_prekillall omit_kill_nbd_client +fi |