Hello community, here is the log from the commit of package jeos-firstboot for openSUSE:Factory checked in at 2018-05-25 21:39:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jeos-firstboot (Old) and /work/SRC/openSUSE:Factory/.jeos-firstboot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jeos-firstboot" Fri May 25 21:39:49 2018 rev:13 rq:612262 version:0.0+git20180525.280836a Changes: -------- --- /work/SRC/openSUSE:Factory/jeos-firstboot/jeos-firstboot.changes 2018-05-16 18:44:52.504178720 +0200 +++ /work/SRC/openSUSE:Factory/.jeos-firstboot.new/jeos-firstboot.changes 2018-05-25 21:39:55.118311925 +0200 @@ -1,0 +2,8 @@ +Fri May 25 13:27:36 UTC 2018 - [email protected] + +- Update to version 0.0+git20180525.280836a: + * Rework locale selection + * Map console fonts for non-latin locale,bsc#1094346 + * Also check for license filenames with the locale's UTF-8 suffix stripped + +------------------------------------------------------------------- Old: ---- jeos-firstboot-0.0+git20180516.d5031a7.tar.xz New: ---- jeos-firstboot-0.0+git20180525.280836a.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jeos-firstboot.spec ++++++ --- /var/tmp/diff_new_pack.zqEgnJ/_old 2018-05-25 21:39:56.002279919 +0200 +++ /var/tmp/diff_new_pack.zqEgnJ/_new 2018-05-25 21:39:56.006279773 +0200 @@ -17,7 +17,7 @@ Name: jeos-firstboot -Version: 0.0+git20180516.d5031a7 +Version: 0.0+git20180525.280836a Release: 0 Summary: Simple text based JeOS first boot wizard License: MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.zqEgnJ/_old 2018-05-25 21:39:56.054278036 +0200 +++ /var/tmp/diff_new_pack.zqEgnJ/_new 2018-05-25 21:39:56.054278036 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/jeos-firstboot.git</param> - <param name="changesrevision">252c30ea5e17c0ec033cb0f998165e2294428aec</param></service></servicedata> + <param name="changesrevision">280836ac14732c09f83084e073b77684ca3254e0</param></service></servicedata> ++++++ jeos-firstboot-0.0+git20180516.d5031a7.tar.xz -> jeos-firstboot-0.0+git20180525.280836a.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jeos-firstboot-0.0+git20180516.d5031a7/files/usr/lib/jeos-firstboot new/jeos-firstboot-0.0+git20180525.280836a/files/usr/lib/jeos-firstboot --- old/jeos-firstboot-0.0+git20180516.d5031a7/files/usr/lib/jeos-firstboot 2018-05-16 11:35:50.000000000 +0200 +++ new/jeos-firstboot-0.0+git20180525.280836a/files/usr/lib/jeos-firstboot 2018-05-25 15:25:11.000000000 +0200 @@ -82,6 +82,16 @@ locale='' password='' +# Console fonts mapping to locales +# this need to be reworked, check bsc#1094346 +declare -A consolefonts +consolefonts["el_GR.UTF-8"]="iso07u-16.psfu" +consolefonts["ru_RU.UTF-8"]="UniCyr_8x16.psf" +consolefonts["sr_RS.UTF-8"]="UniCyr_8x16.psf" +consolefonts["uk_UA.UTF-8"]="UniCyr_8x16.psf" +consolefonts["tg_TJ.UTF-8"]="UniCyr_8x16.psf" +consolefonts["bg_BG.UTF-8"]="UniCyr_8x16.psf" + let dh_menu=LINES-15 let dh_text=LINES-5 @@ -118,28 +128,44 @@ findlocales() { - list=('en_US' '') + list=() local l - for l in /usr/lib/locale/*_??; do - list+=("${l#/usr/lib/locale/}" '') + for l in /usr/lib/locale/*.utf8; do + code=${l#/usr/lib/locale/} + list+=("${code/.utf8/}" '') done [ -n "$list" ] } -if findlocales && d --menu $"Select System Locale" 0 0 $dh_menu "${list[@]}"; then +if findlocales && d --default-item "en_US" --menu $"Select System Locale" 0 0 $dh_menu "${list[@]}"; then if [ -n "$result" ]; then - locale="$result.UTF-8" + locale="${result}.UTF-8" systemd_firstboot_args+=("--locale=$locale") LANG="$locale" export LANG + if [ ${consolefonts[$locale]+_} ]; then + run sed -i -e "s/^FONT=.*/FONT=${consolefonts[$locale]}/" /etc/vconsole.conf + run sed -i -e "s/^CONSOLE_FONT=.*/CONSOLE_FONT=i\"${consolefonts[$locale]}\"/" /etc/vconsole.conf + run /usr/lib/systemd/systemd-vconsole-setup || true # true for nspawn + fi fi else d --msgbox $"Error setting locale" 0 0 fi if [ -e "$EULA_FILE" -a ! -e "${EULA_FILE%/*}/no-acceptance-needed" ]; then - if [ -n "$locale" ]; then - for i in "${EULA_FILE%.txt}.$locale.txt" "${EULA_FILE%.txt}.${locale%%_*}.txt"; do + [ -n "${locale}" ] && language="${locale%%_*}" || language="en" + + # Those languages can't be displayed in the console + declare -A use_english_license + use_english_license["ja"]=1 + use_english_license["zh"]=1 + use_english_license["ko"]=1 + + if [ -n "$locale" -a -z "${use_english_license[${language}]+_}" ]; then + for i in "${EULA_FILE%.txt}.$locale.txt" \ + "${EULA_FILE%.txt}.${locale%%.UTF-8}.txt" \ + "${EULA_FILE%.txt}.${language}.txt"; do if [ -e "$i" ]; then EULA_FILE="$i" break
