Browse Source

Add locale setup

2.3.1
Nathan Owens 1 year ago
parent
commit
8e56457df5
  1. 1
      Makefile
  2. 60
      config.mak
  3. 6
      configure
  4. 3
      module/boot@/configure/configure
  5. 1
      module/boot@/service/all-Local
  6. 23
      module/boot@/service/local/local-locale
  7. 3
      service/boot@

1
Makefile

@ -62,6 +62,7 @@ $(DESTDIR)$(service_directory)/%: service/%
-e "s,@TZ@,$(TZ)," \
-e "s,@SETUPCONSOLE@,$(SETUPCONSOLE)," \
-e "s,@TTY@,$(TTY)," \
-e "s,@LOCALE@,$(LOCALE)," \
-e "s,@KEYMAP@,$(KEYMAP)," \
-e "s,@FONT@,$(FONT)," \
-e "s,@FONT_MAP@,$(FONT_MAP)," \

60
config.mak

@ -0,0 +1,60 @@
# This file was generated by:
# ./configure --LOCALE='!yes'
# Any changes made here will be lost if configure is re-run.
package := boot-66serv
version := 2.3.0
prefix :=
exec_prefix :=
bindir := /bin
libdir := /usr/lib/66
sysconfdir := /etc
datarootdir := /usr/share
mandir := /usr/share/man
livedir := /run/66
service_directory := /usr/share/66/service
module_directory := /usr/share/66/module
script_directory := /usr/share/66/script
adm_conf := /etc/66/conf
skel_directory := /etc/66
package_macro_dir := 66
HOSTNAME=HOSTNAME=obarunS6
HARDWARECLOCK=HARDWARECLOCK=UTC
TZ=TZ=GMT
SETUPCONSOLE=SETUPCONSOLE=!yes
TTY=TTY=!2
LOCALE=LOCALE=!yes
KEYMAP=KEYMAP=!us
FONT=FONT=!lat9w-16
FONT_MAP="\#FONT_MAP="
FONT_UNIMAP="\#FONT_UNIMAP="
UDEV=UDEV=!yes
SYSCTL=SYSCTL=!yes
FORCECHCK=FORCECHCK=!no
LOCAL=LOCAL=!no
CONTAINER=CONTAINER=!no
TMPFILE=TMPFILE=!yes
MODULE_KERNEL=MODULE_KERNEL=!yes
MODULE_SYSTEM=MODULE_SYSTEM=!yes
RANDOMSEED=RANDOMSEED=!yes
FSTAB=FSTAB=!yes
SWAP=SWAP=!no
LVM=LVM=!no
DMRAID=DMRAID=!no
BTRFS=BTRFS=!no
ZFS=ZFS=!no
ZFS_IMPORT=ZFS_IMPORT=!zpoolcache
CRYPTTAB=CRYPTTAB=!no
FIREWALL="\#FIREWALL="
CGROUPS=CGROUPS=!yes
MNT_PROC=MNT_PROC=!yes
MNT_SYS=MNT_SYS=!yes
MNT_DEV=MNT_DEV=!yes
MNT_RUN=MNT_RUN=!yes
MNT_TMP=MNT_TMP=!yes
MNT_PTS=MNT_PTS=!yes
MNT_SHM=MNT_SHM=!yes
MNT_NETFS=MNT_NETFS=!yes
POPULATE_SYS=POPULATE_SYS=!yes
POPULATE_DEV=POPULATE_DEV=!yes
POPULATE_RUN=POPULATE_RUN=!yes
POPULATE_TMP=POPULATE_TMP=!yes

6
configure vendored

@ -31,6 +31,7 @@ Fine tunning of boot configuration:
--TZ=VALUE set timezone [GMT]
--SETUPCONSOLE=BOOLEAN configure the console [!yes]
--TTY=VALUE number of tty to start. Maximum is 11. 0 for no tty at all [!2]
--LOCALE=BOOLEAN Setup locale from /etc/locale.conf or XDG_HOME/locale.conf
--KEYMAP=VALUE set the console keymap [!us]
--FONT=VALUE set the console font [!lat9w-16]
--FONT_MAP=VALUE set the console map []
@ -146,6 +147,7 @@ HARDWARECLOCK='UTC'
TZ='GMT'
SETUPCONSOLE='!yes'
TTY='!2'
LOCALE='!yes'
KEYMAP='!us'
FONT='!lat9w-16'
FONT_MAP=
@ -204,6 +206,7 @@ for arg ; do
--TZ=*) TZ=${arg#*=} ;;
--SETUPCONSOLE=*) SETUPCONSOLE=${arg#*=} ;;
--TTY=*) TTY=${arg#*=} ;;
--LOCALE=*) LOCALE=${arg#*=} ;;
--KEYMAP=*) KEYMAP=${arg#*=} ;;
--FONT=*) FONT=${arg#*=} ;;
--FONT_MAP=*) FONT_MAP=${arg#*=} ;;
@ -289,7 +292,7 @@ for i in service_directory module_directory script_directory mandir; do
stripdir $i
done
for i in HOSTNAME HARDWARECLOCK TZ SETUPCONSOLE TTY \
for i in HOSTNAME HARDWARECLOCK TZ SETUPCONSOLE TTY LOCALE \
KEYMAP FONT FONT_MAP FONT_UNIMAP UDEV SYSCTL FORCECHCK LOCAL CONTAINER \
TMPFILE MODULE_KERNEL MODULE_SYSTEM RANDOMSEED \
FSTAB SWAP LVM DMRAID BTRFS ZFS ZFS_IMPORT \
@ -347,6 +350,7 @@ $HARDWARECLOCK
$TZ
$SETUPCONSOLE
$TTY
$LOCALE
$KEYMAP
$FONT
$FONT_MAP

3
module/boot@/configure/configure vendored

@ -10,7 +10,7 @@ export COLOR_ENABLED="${MOD_COLOR}"
service_dir="${MOD_MODULE_DIR}/service"
SV_REAL=
sv_boolean_list="CRYPTTAB SETUPCONSOLE FSTAB SWAP LVM \
sv_boolean_list="CRYPTTAB SETUPCONSOLE FSTAB SWAP LVM LOCALE \
DMRAID BTRFS ZFS UDEV SYSCTL LOCAL CONTAINER TMPFILE MODULE_KERNEL \
MODULE_SYSTEM RANDOMSEED MNT_PROC MNT_SYS MNT_DEV MNT_RUN MNT_TMP CGROUPS \
MNT_PTS MNT_SHM MNT_NETFS POPULATE_SYS POPULATE_DEV POPULATE_RUN POPULATE_TMP"
@ -64,6 +64,7 @@ retrieve_sv_name(){
POPULATE_RUN) SV_REAL="populate-run" ;;
POPULATE_TMP) SV_REAL="populate-tmp" ;;
TTY) SV_REAL="tty-rc@" ;;
LOCALE) SV_REAL="local-locale" ;;
## extra service not set by the environment section
UDEV_ADM) SV_REAL="udevadm" ;;
esac

1
module/boot@/service/all-Local

@ -20,4 +20,5 @@ local-authfiles
local-tmpfiles
local-rc
local-dmesg
local-locale
)

23
module/boot@/service/local/local-locale

@ -0,0 +1,23 @@
[main]
@type = oneshot
@version = @vers@
@description = "Set locale"
@options = ( !log )
@depends = ( mount-rw )
@user = ( root )
[start]
@execute =
(
if { 66-yeller -cdp local-locale -1 /dev/console starts... }
if -nt {
execl-envfile ${conf_file}
execl-cmdline -s { sh /etc/profile.d/locale.sh }
}
66-yeller -fcdp local-locale -1 /dev/console crashed!
)
[environment]
conf_file=!@bootconf@

3
service/boot@

@ -48,6 +48,9 @@
@TZ@
# Set locale
@LOCALE@
## Set the number of tty(s) to start.
## 0 means no tty. Maximum is 11.

Loading…
Cancel
Save