mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
run locale script on first login
This commit is contained in:
parent
5a0184e27f
commit
ee8cec9d7c
3 changed files with 6 additions and 2 deletions
|
@ -24,6 +24,7 @@ _abort()
|
||||||
_do_locale() {
|
_do_locale() {
|
||||||
_dialog --infobox "Setting System Wide Locale ${_LOCALE}..." 3 80
|
_dialog --infobox "Setting System Wide Locale ${_LOCALE}..." 3 80
|
||||||
echo "LANG=${_LOCALE}.UTF-8" > /etc/locale.conf
|
echo "LANG=${_LOCALE}.UTF-8" > /etc/locale.conf
|
||||||
|
echo "LANG=${_LOCALE}.UTF-8" > /tmp/.locale
|
||||||
echo LC_COLLATE=C >> /etc/locale.conf
|
echo LC_COLLATE=C >> /etc/locale.conf
|
||||||
localectl set-locale "${_LOCALE}.UTF-8"
|
localectl set-locale "${_LOCALE}.UTF-8"
|
||||||
sleep 2
|
sleep 2
|
||||||
|
@ -40,7 +41,7 @@ _set_locale() {
|
||||||
|
|
||||||
if [[ -e /tmp/.locale-running ]]; then
|
if [[ -e /tmp/.locale-running ]]; then
|
||||||
echo "System Wide Locale Setting already runs on a different console!"
|
echo "System Wide Locale Setting already runs on a different console!"
|
||||||
echo "Please remove /tmp/.locale-running first to launch tz!"
|
echo "Please remove /tmp/.locale-running first!"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
: >/tmp/.locale-running
|
: >/tmp/.locale-running
|
||||||
|
|
|
@ -152,6 +152,9 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -e /usr/bin/setup ]]; then
|
if [[ -e /usr/bin/setup ]]; then
|
||||||
|
if ! [[ -e /tmp/.locale ]]; then
|
||||||
|
archboot-locale.sh
|
||||||
|
fi
|
||||||
_local_mode
|
_local_mode
|
||||||
_enter_shell
|
_enter_shell
|
||||||
if ! [[ -e /tmp/.setup ]]; then
|
if ! [[ -e /tmp/.setup ]]; then
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
build ()
|
build ()
|
||||||
{
|
{
|
||||||
map add_binary genfstab arch-chroot pacstrap \
|
map add_binary genfstab arch-chroot pacstrap \
|
||||||
archboot-binary-check.sh archboot-not-installed.sh
|
archboot-binary-check.sh archboot-not-installed.sh archboot-locale.sh
|
||||||
add_file "/usr/bin/archboot-setup.sh" "/usr/bin/setup"
|
add_file "/usr/bin/archboot-setup.sh" "/usr/bin/setup"
|
||||||
add_file "/usr/bin/archboot-quickinst.sh" "/usr/bin/quickinst"
|
add_file "/usr/bin/archboot-quickinst.sh" "/usr/bin/quickinst"
|
||||||
add_file "/usr/bin/archboot-copy-mountpoint.sh" "/usr/bin/copy-mountpoint.sh"
|
add_file "/usr/bin/archboot-copy-mountpoint.sh" "/usr/bin/copy-mountpoint.sh"
|
||||||
|
|
Loading…
Reference in a new issue