Hello community, here is the log from the commit of package jeos-firstboot for openSUSE:Factory checked in at 2019-02-27 15:05:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jeos-firstboot (Old) and /work/SRC/openSUSE:Factory/.jeos-firstboot.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jeos-firstboot" Wed Feb 27 15:05:18 2019 rev:21 rq:678940 version:0.0+git20190222.ccc0ad8 Changes: -------- --- /work/SRC/openSUSE:Factory/jeos-firstboot/jeos-firstboot.changes 2018-12-08 11:22:07.702738455 +0100 +++ /work/SRC/openSUSE:Factory/.jeos-firstboot.new.28833/jeos-firstboot.changes 2019-02-27 15:05:20.522461569 +0100 @@ -1,0 +2,15 @@ +Fri Feb 22 12:49:37 UTC 2019 - [email protected] + +- Update to version 0.0+git20190222.ccc0ad8: + * Fix backtitle of license agreement regression + +------------------------------------------------------------------- +Wed Feb 13 10:01:36 UTC 2019 - [email protected] + +- Update to version 0.0+git20190213.3c01127: + * Less warnings, fix license decline dialog + * Do not fail on wireless setup + * Avoid systemd output on the screen, bsc#1119382 + * Check wlan adaptor presence, bsc#1122901 + +------------------------------------------------------------------- Old: ---- jeos-firstboot-0.0+git20181207.6b889b0.tar.xz New: ---- jeos-firstboot-0.0+git20190222.ccc0ad8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jeos-firstboot.spec ++++++ --- /var/tmp/diff_new_pack.uQhHau/_old 2019-02-27 15:05:21.062461411 +0100 +++ /var/tmp/diff_new_pack.uQhHau/_new 2019-02-27 15:05:21.066461409 +0100 @@ -1,7 +1,7 @@ # # spec file for package jeos-firstboot # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: jeos-firstboot -Version: 0.0+git20181207.6b889b0 +Version: 0.0+git20190222.ccc0ad8 Release: 0 Summary: Simple text based JeOS first boot wizard License: MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.uQhHau/_old 2019-02-27 15:05:21.086461404 +0100 +++ /var/tmp/diff_new_pack.uQhHau/_new 2019-02-27 15:05:21.086461404 +0100 @@ -4,6 +4,7 @@ <param name="versionformat">0.0+git%cd.%h</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> + <param name="changesauthor">[email protected]</param> </service> <service name="recompress" mode="disabled"> <param name="compression">xz</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.uQhHau/_old 2019-02-27 15:05:21.102461399 +0100 +++ /var/tmp/diff_new_pack.uQhHau/_new 2019-02-27 15:05:21.106461398 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/jeos-firstboot.git</param> - <param name="changesrevision">6b889b066db172debb6525a070ab95fc0ddff9d1</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">64167ba4a4bdc47dae4e9ba0d050a36dae4889af</param></service></servicedata> \ No newline at end of file ++++++ jeos-firstboot-0.0+git20181207.6b889b0.tar.xz -> jeos-firstboot-0.0+git20190222.ccc0ad8.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jeos-firstboot-0.0+git20181207.6b889b0/files/usr/lib/jeos-firstboot new/jeos-firstboot-0.0+git20190222.ccc0ad8/files/usr/lib/jeos-firstboot --- old/jeos-firstboot-0.0+git20181207.6b889b0/files/usr/lib/jeos-firstboot 2018-12-07 16:38:21.000000000 +0100 +++ new/jeos-firstboot-0.0+git20190222.ccc0ad8/files/usr/lib/jeos-firstboot 2019-02-22 13:27:42.000000000 +0100 @@ -73,6 +73,8 @@ run setterm -msg off # Avoid systemd messages spamming our console run kill -s SIGRTMAX-9 1 +# sleep to avoid systemd bug, bsc#1119382 +sleep 1 systemd_firstboot_args=('--setup-machine-id') @@ -98,14 +100,14 @@ return 0 ;; 1) - dialog --yesno $"Do you really want to quit?" 0 0 && exit 0 + dialog --yesno $"Do you really want to quit?" 0 0 && exit 1 continue ;; 255) # xargs to remove whitespaces result_error="$(xargs -a "$dialog_out")" if [ -z "$result_error" ]; then - dialog --yesno $"Do you really want to quit?" 0 0 && exit 0 + dialog --yesno $"Do you really want to quit?" 0 0 && exit 1 continue fi logger -p err -t jeos-firstboot "$result_error" @@ -246,7 +248,7 @@ done fi - while ! d --textbox "$EULA_FILE" $dh_text 85 --and-widget --yesno $"Do you agree with the terms of the license?" 0 0; do + while ! dialog --backtitle "$PRETTY_NAME" --textbox "$EULA_FILE" $dh_text 85 --and-widget --yesno $"Do you agree with the terms of the license?" 0 0; do d --msgbox $"Well, we cannot continue then ..." 6 40 done fi @@ -337,7 +339,7 @@ done config_wireless=false -if is_raspberry; then +if is_raspberry && ls -d /sys/class/net/*/wireless &>/dev/null; then if dialog --yesno $"Configure wireless network?" 0 0; then config_wireless=true fi @@ -362,43 +364,60 @@ while read line; do list+=("${line}" '') done < <(ip link set $wlan_device up && iwlist $wlan_device scan|grep ESSID|cut -d':' -f2|cut -d'"' -f2|sort -u) - [ -n "$list" ] + [ -n "${list[*]}" ] } - if get_wlan_devices && d --menu $"Select Wireless card to configure" 0 0 $dh_menu "${list[@]}"; then - wlan_device="$result" - else - d --msgbox $"Error getting wlan devices" 0 0 - exit 1 - fi + wlan_error(){ + d --title $"Error" --msgbox "$1" 0 0 + dialog --yesno $"Do you want to retry?" 0 0 + } + while true + do + if get_wlan_devices && d --menu $"Select Wireless card to configure" 0 0 $dh_menu "${list[@]}"; then + wlan_device="$result" + else + if wlan_error $"Error listing wlan devices"; then + continue + else + break + fi + fi - if get_wlan_networks && d --menu $"Select Wireless network to connect" 0 0 $dh_menu "${list[@]}"; then - wlan_network="$result" - fi + if get_wlan_networks && d --menu $"Select Wireless network to connect" 0 0 $dh_menu "${list[@]}"; then + wlan_network="$result" + else + if wlan_error $"Error listing wireless networks"; then + continue + else + break + fi + fi - if d --menu $"Select authentication mode" 0 0 $dh_menu $"WPA-PSK" '' $"WPA-EAP" '' $"Open" ''; then - wlan_auth_mode="$result" - fi - wlan_auth_mode_conf= - if [ "$wlan_auth_mode" = "WPA-EAP" ]; then - wlan_auth_mode_conf=eap - if d --inputbox $"Username" 0 0; then - wlan_username="$result" + if d --menu $"Select authentication mode" 0 0 $dh_menu $"WPA-PSK" '' $"WPA-EAP" '' $"Open" ''; then + wlan_auth_mode="$result" fi - fi - if [ "$wlan_auth_mode" = "WPA-PSK" ]; then - wlan_auth_mode_conf=psk - fi - if [ "$wlan_auth_mode" = "Open" ]; then - wlan_auth_mode_conf=open - fi - if [ "$wlan_auth_mode" != "Open" ]; then - wlan_password= - if d --insecure --passwordbox $"Password" 0 0; then - wlan_password="$result" + wlan_auth_mode_conf= + if [ "$wlan_auth_mode" = "WPA-EAP" ]; then + wlan_auth_mode_conf=eap + if d --inputbox $"Username" 0 0; then + wlan_username="$result" + fi fi - fi - + if [ "$wlan_auth_mode" = "WPA-PSK" ]; then + wlan_auth_mode_conf=psk + fi + if [ "$wlan_auth_mode" = "Open" ]; then + wlan_auth_mode_conf=open + fi + if [ "$wlan_auth_mode" != "Open" ]; then + wlan_password= + if d --insecure --passwordbox $"Password" 0 0; then + wlan_password="$result" + fi + fi + break + done + config_file=`mktemp -qt 'firstboot-XXXXXX'` cat << EOF > $config_file @@ -417,6 +436,7 @@ if [ $wlan_auth_mode = "WPA-EAP" ]; then echo "WIRELESS_WPA_IDENTITY='$wlan_username'" >> $config_file echo "WIRELESS_WPA_PASSWORD='$wlan_password'" >> $config_file + echo "WIRELESS_EAP_AUTH='mschapv2'" >> $config_file fi run mv -f $config_file /etc/sysconfig/network/ifcfg-$wlan_device @@ -447,7 +467,7 @@ run /usr/lib/snapper/plugins/grub --refresh if [ "$config_wireless" = "true" ]; then - run ifdown $wlan_device - run ifup $wlan_device + run ifdown $wlan_device 2>/dev/null || true + run ifup $wlan_device || true fi # vim: sw=4
