Hello community, here is the log from the commit of package jeos-firstboot for openSUSE:Factory checked in at 2018-10-15 09:39:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jeos-firstboot (Old) and /work/SRC/openSUSE:Factory/.jeos-firstboot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jeos-firstboot" Mon Oct 15 09:39:13 2018 rev:18 rq:641400 version:0.0+git20181008.086fc72 Changes: -------- --- /work/SRC/openSUSE:Factory/jeos-firstboot/jeos-firstboot.changes 2018-08-10 09:52:58.282579209 +0200 +++ /work/SRC/openSUSE:Factory/.jeos-firstboot.new/jeos-firstboot.changes 2018-10-15 09:41:18.443491394 +0200 @@ -1,0 +2,7 @@ +Fri Oct 12 07:58:25 UTC 2018 - [email protected] + +- Update to version 0.0+git20181008.086fc72: + * Prefix more commands with "run" to allow test runs as non-root + * Only list locales which glibc has information about + +------------------------------------------------------------------- Old: ---- jeos-firstboot-0.0+git20180808.85a2c03.tar.xz New: ---- jeos-firstboot-0.0+git20181008.086fc72.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jeos-firstboot.spec ++++++ --- /var/tmp/diff_new_pack.CgnjhY/_old 2018-10-15 09:41:21.567488532 +0200 +++ /var/tmp/diff_new_pack.CgnjhY/_new 2018-10-15 09:41:21.571488528 +0200 @@ -12,12 +12,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: jeos-firstboot -Version: 0.0+git20180808.85a2c03 +Version: 0.0+git20181008.086fc72 Release: 0 Summary: Simple text based JeOS first boot wizard License: MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.CgnjhY/_old 2018-10-15 09:41:21.599488502 +0200 +++ /var/tmp/diff_new_pack.CgnjhY/_new 2018-10-15 09:41:21.599488502 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/jeos-firstboot.git</param> - <param name="changesrevision">885e12ec816c55737a75f76a8e8f11ce59a9eae5</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">7d63e1581cc1804cbf735384d2f44057298abe27</param></service></servicedata> \ No newline at end of file ++++++ jeos-firstboot-0.0+git20180808.85a2c03.tar.xz -> jeos-firstboot-0.0+git20181008.086fc72.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jeos-firstboot-0.0+git20180808.85a2c03/files/usr/lib/jeos-firstboot new/jeos-firstboot-0.0+git20181008.086fc72/files/usr/lib/jeos-firstboot --- old/jeos-firstboot-0.0+git20180808.85a2c03/files/usr/lib/jeos-firstboot 2018-08-08 12:02:33.000000000 +0200 +++ new/jeos-firstboot-0.0+git20181008.086fc72/files/usr/lib/jeos-firstboot 2018-10-08 15:02:18.000000000 +0200 @@ -64,7 +64,7 @@ cleanup() { echo .oOo.oOo.oOo. > $dialog_out rm -f "$dialog_out" - kill -s SIGRTMAX-10 1 + run kill -s SIGRTMAX-10 1 run setterm -msglevel 4 2>/dev/null } trap cleanup EXIT @@ -72,7 +72,7 @@ # avoid kernel messages spamming our console run setterm -msg off # Avoid systemd messages spamming our console -kill -s SIGRTMAX-9 1 +run kill -s SIGRTMAX-9 1 systemd_firstboot_args=('--setup-machine-id') @@ -123,9 +123,12 @@ findlocales() { list=() - local l + local l locale + # List only locales which are both in live-langset-data and glibc-locale(-base) for l in /usr/share/langset/*; do - list+=("${l#/usr/share/langset/}" '') + locale="${l#/usr/share/langset/}" + [ -d "/usr/lib/locale/${locale}.utf8" ] || continue + list+=("${locale}" '') done [ -n "$list" ] } @@ -135,16 +138,23 @@ [ -f /etc/locale.conf ] && locale_lang="$(awk -F= '$1 == "LANG" { split($2,fs,"."); print fs[1]; exit }' /etc/locale.conf)" [ -n "$locale_lang" ] && default="$locale_lang" - if findlocales && d --default-item "$default" --menu $"Select System Locale" 0 0 $dh_menu "${list[@]}"; then - if [ -n "$result" ]; then - locale="${result}.UTF-8" - systemd_firstboot_args+=("--locale=$locale") - - # Run langset to get consolefont and keymap set up - run langset.sh $locale || warn $"Setting the locale failed" - fi + list=() + result="$default" + if ! findlocales; then + d --msgbox $"No locales found" 0 0 + elif [ "${#list[@]}" -eq 2 ]; then + result="${list[0]}" + d --msgbox $"Locale set to $result.\nTo change to a different one, install glibc-locale and use\n'localectl set-locale LANG=ex_AMPLE.UTF-8'." 8 50 else - d --msgbox $"Error setting locale" 0 0 + d --default-item "$default" --menu $"Select System Locale" 0 0 $dh_menu "${list[@]}" + fi + + if [ -n "$result" ]; then + locale="${result}.UTF-8" + systemd_firstboot_args+=("--locale=$locale") + + # Run langset to get consolefont and keymap set up + run langset.sh $locale || warn $"Setting the locale failed" fi else locale="$LOCALE_PRESET" @@ -282,7 +292,7 @@ EFI_SYSTAB="/sys/firmware/efi/systab" # Look for EFI dir to see if the machine is booted in UEFI mode -modprobe efivars +run modprobe efivars if ! [ -f "$EFI_SYSTAB" ]; then run sed -i -e "s/LOADER_TYPE=.*/LOADER_TYPE=grub2/g" /etc/sysconfig/bootloader fi
