Hello community, here is the log from the commit of package jeos-firstboot for openSUSE:Factory checked in at 2019-12-02 11:33:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jeos-firstboot (Old) and /work/SRC/openSUSE:Factory/.jeos-firstboot.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jeos-firstboot" Mon Dec 2 11:33:07 2019 rev:30 rq:751396 version:0.0+git20191127.be35ecb Changes: -------- --- /work/SRC/openSUSE:Factory/jeos-firstboot/jeos-firstboot.changes 2019-10-22 15:38:44.481258253 +0200 +++ /work/SRC/openSUSE:Factory/.jeos-firstboot.new.4691/jeos-firstboot.changes 2019-12-02 11:37:53.870455082 +0100 @@ -1,0 +2,8 @@ +Wed Nov 27 15:45:34 UTC 2019 - [email protected] + +- Update to version 0.0+git20191127.be35ecb: + * Improve Rpi wireless config, jsc#SLE-10603 + * Disable exit on error during dialog execution + * Clarify comment about localectl list-keymaps + +------------------------------------------------------------------- Old: ---- jeos-firstboot-0.0+git20191021.66ccca7.tar.xz New: ---- jeos-firstboot-0.0+git20191127.be35ecb.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jeos-firstboot.spec ++++++ --- /var/tmp/diff_new_pack.gDSyl5/_old 2019-12-02 11:37:54.286455169 +0100 +++ /var/tmp/diff_new_pack.gDSyl5/_new 2019-12-02 11:37:54.286455169 +0100 @@ -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+git20191021.66ccca7 +Version: 0.0+git20191127.be35ecb Release: 0 Summary: Simple text based JeOS first boot wizard License: MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.gDSyl5/_old 2019-12-02 11:37:54.326455178 +0100 +++ /var/tmp/diff_new_pack.gDSyl5/_new 2019-12-02 11:37:54.326455178 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/jeos-firstboot.git</param> - <param name="changesrevision">b24bc3b1b02ba011a5fdc8102fce29d160fa29e7</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">2de210339882818f3bd0183d0baa964d2785ef83</param></service></servicedata> \ No newline at end of file ++++++ jeos-firstboot-0.0+git20191021.66ccca7.tar.xz -> jeos-firstboot-0.0+git20191127.be35ecb.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jeos-firstboot-0.0+git20191021.66ccca7/files/usr/lib/jeos-firstboot new/jeos-firstboot-0.0+git20191127.be35ecb/files/usr/lib/jeos-firstboot --- old/jeos-firstboot-0.0+git20191021.66ccca7/files/usr/lib/jeos-firstboot 2019-10-21 13:57:43.000000000 +0200 +++ new/jeos-firstboot-0.0+git20191127.be35ecb/files/usr/lib/jeos-firstboot 2019-11-27 16:45:14.000000000 +0100 @@ -122,8 +122,11 @@ retval= while true do + # disable exit on error for capturing dialog return codes + set +e dialog --backtitle "$PRETTY_NAME" --output-fd 3 "$@" 3>"${dialog_out}" retval=$? + set -e case $retval in 0) # need || true as dialog doesn't write newlines @@ -163,8 +166,8 @@ [ -n "$list" ] } -# for some reason localectl doesn't work here -#menulist localectl --no-pager list-keymaps +# localectl --no-pager list-keymaps does not list aliases (symlinks), but those are used +# by YaST/langset.sh, so we need to show them. findkeymaps() { list=() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jeos-firstboot-0.0+git20191021.66ccca7/files/usr/share/jeos-firstboot/raspberrywifi new/jeos-firstboot-0.0+git20191127.be35ecb/files/usr/share/jeos-firstboot/raspberrywifi --- old/jeos-firstboot-0.0+git20191021.66ccca7/files/usr/share/jeos-firstboot/raspberrywifi 2019-10-21 13:57:43.000000000 +0200 +++ new/jeos-firstboot-0.0+git20191127.be35ecb/files/usr/share/jeos-firstboot/raspberrywifi 2019-11-27 16:45:14.000000000 +0100 @@ -75,7 +75,7 @@ if [ "${#list[@]}" -eq "2" ]; then wlan_device="${list[0]}" else - d --menu $"Select Wireless card to configure" 0 0 $dh_menu "${list[@]}" + d --menu $"Select wireless card to configure" 0 0 $dh_menu "${list[@]}" wlan_device="${result}" fi @@ -105,15 +105,13 @@ fi if [ "$wlan_auth_mode" != "Open" ]; then wlan_password= - d --insecure --passwordbox $"Password" 0 0 + d --insecure --passwordbox $"Network password" 0 0 wlan_password="$result" fi - break - done - config_file=`mktemp -qt 'firstboot-XXXXXX'` + config_file=`mktemp -qt 'firstboot-XXXXXX'` - cat << EOF > $config_file + cat << EOF > $config_file BOOTPROTO='dhcp' STARTMODE='auto' WIRELESS_AP_SCANMODE='1' @@ -122,23 +120,40 @@ WIRELESS_MODE='Managed' EOF - if [ $wlan_auth_mode = "WPA-PSK" ]; then - echo "WIRELESS_WPA_PSK='$wlan_password'" >> $config_file - fi - - 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 + if [ $wlan_auth_mode = "WPA-PSK" ]; then + echo "WIRELESS_WPA_PSK='$wlan_password'" >> $config_file + fi - run mv -f $config_file /etc/sysconfig/network/ifcfg-$wlan_device + 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 + d --infobox $"Connecting to wireless network ..." 3 38 || true + + run ifdown $wlan_device &>/dev/null || true + # Disabling exit on error to capture exit code + set +e + ifup $wlan_device &>/dev/null + ret_val=$? + set -e + if [ $ret_val -ne 0 ]; then + if dialog --yesno $"Connection failed, do you wish to retry?" 0 0; then + continue + else + # Otherwise, return 0 to continue main execution + return 0 + fi + else + break + fi + done } # This is called after the configuration steps finished successfully raspberrywifi_post() { - [ "$config_wireless" = "true" ] || return 0 - run ifdown $wlan_device 2>/dev/null || true - run ifup $wlan_device || true + return 0 }
