Commit 7249d6f3 authored by udeved's avatar udeved

manjaro-live: add more debug messages

parent 43abf70e
......@@ -30,7 +30,10 @@ echo "Activated swap and added to fstab: $(elapsed_time_ms ${livetimer})ms" >> /
livetimer=$(get_timer_ms)
configure_language
echo "Languaged configured: $(elapsed_time_ms ${livetimer})ms" >> /var/log/manjaro-live.log
echo "Configured language: ${lang}" >> /var/log/manjaro-live.log
echo "Configured keymap: ${keytable}" >> /var/log/manjaro-live.log
echo "Configured timezone: ${timezone}" >> /var/log/manjaro-live.log
echo "Finished localization: $(elapsed_time_ms ${livetimer})ms" >> /var/log/manjaro-live.log
livetimer=$(get_timer_ms)
configure_user
......@@ -56,9 +59,11 @@ livetimer=$(get_timer_ms)
configure_user_root /
echo "Configured root user: $(elapsed_time_ms ${livetimer})ms" >> /var/log/manjaro-live.log
livetimer=$(get_timer_ms)
configure_samba
echo "Configured samba: $(elapsed_time_ms ${livetimer})ms" >> /var/log/manjaro-live.log
if [[ -f /usr/bin/samba ]];then
livetimer=$(get_timer_ms)
configure_samba
echo "Configured samba: $(elapsed_time_ms ${livetimer})ms" >> /var/log/manjaro-live.log
fi
livetimer=$(get_timer_ms)
# load dm-mod
......
......@@ -138,12 +138,10 @@ set_pam(){
done
}
configure_samba(){
if [[ -f /usr/bin/samba ]];then
local conf=/etc/samba/smb.conf
cp /etc/samba/smb.conf.default $conf
sed -e "s|^.*workgroup =.*|workgroup = ${smb_workgroup}|" -i $conf
fi
configure_samba(){
local conf=/etc/samba/smb.conf
cp /etc/samba/smb.conf.default $conf
sed -e "s|^.*workgroup =.*|workgroup = ${smb_workgroup}|" -i $conf
}
configure_displaymanager(){
......@@ -262,33 +260,33 @@ write_x11_config(){
}
configure_language(){
# hack to be able to set the locale on bootup
local lang=$(get_lang)
local keytable=$(get_keytable)
local timezone=$(get_tz)
# this is needed for efi, it doesn't set any cmdline
[[ -z "${lang}" ]] && lang="en_US"
[[ -z "${keytable}" ]] && keytable="us"
sed -e "s/#${lang}.UTF-8/${lang}.UTF-8/" -i /etc/locale.gen
# echo "LANG=${lang}.UTF-8" >> /etc/environment
if [[ -d /run/openrc ]]; then
sed -i "s/keymap=.*/keymap=\"${keytable}\"/" /etc/conf.d/keymaps
ln -sf /usr/share/zoneinfo/${timezone} /etc/timezone
# hack to be able to set the locale on bootup
local lang=$(get_lang)
local keytable=$(get_keytable)
local timezone=$(get_tz)
# Fallback
#[[ -z "${lang}" ]] && lang="en_US"
#[[ -z "${keytable}" ]] && keytable="us"
#[[ -z "${timezone}" ]] && timezone="Europe/London"
sed -e "s/#${lang}.UTF-8/${lang}.UTF-8/" -i /etc/locale.gen
# echo "LANG=${lang}.UTF-8" >> /etc/environment
if [[ -d /run/openrc ]]; then
sed -i "s/keymap=.*/keymap=\"${keytable}\"/" /etc/conf.d/keymaps
ln -sf /usr/share/zoneinfo/${timezone} /etc/timezone
else
ln -sf /usr/share/zoneinfo/${timezone} /etc/localtime
fi
echo "KEYMAP=${keytable}" > /etc/vconsole.conf
echo "LANG=${lang}.UTF-8" > /etc/locale.conf
fi
echo "KEYMAP=${keytable}" > /etc/vconsole.conf
echo "LANG=${lang}.UTF-8" > /etc/locale.conf
write_x11_config
write_x11_config
loadkeys "${keytable}"
loadkeys "${keytable}"
locale-gen ${lang}
locale-gen ${lang}
}
configure_machine_id(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment