root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

Merge branch 'devel' of github.com:manjaro/manjaro-tools into devel

Browse source
This commit is contained in:
udeved 2015-09-25 16:44:43 +02:00
commit 4c68528617
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/livecd
View file

@ -24,13 +24,7 @@ configure_language
echo "Languaged configured: $(elapsed_time_ms ${livetimer})ms" >> /var/log/livecd.log
livetimer=$(get_timer_ms)
CURRENT_LOCALE=$(cat $1/etc/locale.conf | grep LANG= | cut -d= -f2 | cut -d. -f1)
# en_US and de_DE are the only locales that are generated in buildiso
if [[ "${CURRENT_LOCALE}" != "en_US" && "${CURRENT_LOCALE}" != "de_DE" ]];then
locale-gen
else
echo "Skipped locale-gen for en_US or de_DE" >> /var/log/livecd.log
fi
locale-gen
echo "Ran locale-gen: $(elapsed_time_ms ${livetimer})ms" >> /var/log/livecd.log
configure_clock