Hello community,
here is the log from the commit of package jeos-firstboot for
openSUSE:Leap:15.2 checked in at 2020-02-29 17:15:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/jeos-firstboot (Old)
and /work/SRC/openSUSE:Leap:15.2/.jeos-firstboot.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jeos-firstboot"
Sat Feb 29 17:15:08 2020 rev:55 rq:779786 version:0.0+git20200226.95cfe28
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/jeos-firstboot/jeos-firstboot.changes
2020-01-15 15:13:22.742173234 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.jeos-firstboot.new.26092/jeos-firstboot.changes
2020-02-29 17:15:10.864886291 +0100
@@ -1,0 +2,10 @@
+Wed Feb 26 15:46:46 UTC 2020 - [email protected]
+
+- Update to version 0.0+git20200226.95cfe28:
+ * Show license on openSUSE as well (bsc#1164583)
+ * Improve variable names on net config
+ * Fix EULA message position
+ * Fix comments typo
+ * Improve coding style
+
+-------------------------------------------------------------------
Old:
----
jeos-firstboot-0.0+git20191127.be35ecb.tar.xz
New:
----
jeos-firstboot-0.0+git20200226.95cfe28.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jeos-firstboot.spec ++++++
--- /var/tmp/diff_new_pack.fP2tIE/_old 2020-02-29 17:15:11.240887066 +0100
+++ /var/tmp/diff_new_pack.fP2tIE/_new 2020-02-29 17:15:11.240887066 +0100
@@ -1,7 +1,7 @@
#
# spec file for package jeos-firstboot
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# 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+git20191127.be35ecb
+Version: 0.0+git20200226.95cfe28
Release: 0
Summary: Simple text based JeOS first boot wizard
License: MIT
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.fP2tIE/_old 2020-02-29 17:15:11.288887165 +0100
+++ /var/tmp/diff_new_pack.fP2tIE/_new 2020-02-29 17:15:11.292887173 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">git://github.com/openSUSE/jeos-firstboot.git</param>
- <param
name="changesrevision">2de210339882818f3bd0183d0baa964d2785ef83</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">d2e38b4c0453f0d15932789be9d1850882bd704a</param></service></servicedata>
\ No newline at end of file
++++++ jeos-firstboot-0.0+git20191127.be35ecb.tar.xz ->
jeos-firstboot-0.0+git20200226.95cfe28.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jeos-firstboot-0.0+git20191127.be35ecb/files/usr/lib/jeos-firstboot
new/jeos-firstboot-0.0+git20200226.95cfe28/files/usr/lib/jeos-firstboot
--- old/jeos-firstboot-0.0+git20191127.be35ecb/files/usr/lib/jeos-firstboot
2019-11-27 16:45:14.000000000 +0100
+++ new/jeos-firstboot-0.0+git20200226.95cfe28/files/usr/lib/jeos-firstboot
2020-02-26 16:44:03.000000000 +0100
@@ -122,11 +122,8 @@
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
+ retval=0
+ dialog --backtitle "$PRETTY_NAME" --output-fd 3 "$@"
3>"${dialog_out}" || retval=$?
case $retval in
0)
# need || true as dialog doesn't write newlines
@@ -204,7 +201,7 @@
newlocale="${list[0]}"
d --msgbox $"Locale set to $newlocale.\nTo change to a
different one, install glibc-locale and use\n'localectl set-locale
LANG=ex_AMPLE.UTF-8'." 8 50
else
- d --default-item "$default" --menu $"Select System Locale" 0 0
$dh_menu "${list[@]}"
+ d --default-item "$default" --menu $"Select system locale" 0 0
$dh_menu "${list[@]}"
newlocale="${result}"
fi
@@ -220,7 +217,7 @@
[ -n "$vconsole_keymap" ] && default="$vconsole_keymap"
if findkeymaps \
- && d --default-item "$default" --menu $"Select Keyboard
Layout" 0 0 $dh_menu "${list[@]}"; then
+ && d --default-item "$default" --menu $"Select keyboard
layout" 0 0 $dh_menu "${list[@]}"; then
if [ -n "$result" ]; then
JEOS_KEYTABLE="$result"
fi
@@ -268,29 +265,27 @@
EULA_FILE=/etc/YaST2/licenses/base/license.txt
[ -e "${EULA_FILE}" ] || EULA_FILE=/usr/share/licenses/product/base/license.txt
-# Failsafe: If neither a license nor the no-acceptance-needed flag are found,
quit.
-if ! [ -e "$EULA_FILE" -o -e "${EULA_FILE%/*}/no-acceptance-needed" ]; then
+# Failsafe: If no license found, quit.
+if ! [ -e "$EULA_FILE" ]; then
d --msgbox $"No license found - cannot continue" 6 40
exit 1
fi
-if [ -e "$EULA_FILE" -a ! -e "${EULA_FILE%/*}/no-acceptance-needed" ]; then
- if [ "$force_english_license" = "0" ]; then
- for i in "${EULA_FILE%.txt}.${JEOS_LOCALE}.txt" \
- "${EULA_FILE%.txt}.${JEOS_LOCALE%%.UTF-8}.txt" \
- "${EULA_FILE%.txt}.${language}.txt"; do
- if [ -e "$i" ]; then
- EULA_FILE="$i"
- break
- fi
- done
- fi
-
- 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
+if [ "$force_english_license" = "0" ]; then
+ for i in "${EULA_FILE%.txt}.${JEOS_LOCALE}.txt" \
+ "${EULA_FILE%.txt}.${JEOS_LOCALE%%.UTF-8}.txt" \
+ "${EULA_FILE%.txt}.${language}.txt"; do
+ if [ -e "$i" ]; then
+ EULA_FILE="$i"
+ break
+ fi
done
fi
+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 $"Can not continue without agreement" 6 40
+done
+
default="$(readlink -f /etc/localtime)"
default="${default##/usr/share/zoneinfo/}"
@@ -300,12 +295,12 @@
if menulist awk \
'BEGIN{print "UTC"; sort="sort"}/^#/{next;}{print
$3|sort}END{close(sort)}' \
/usr/share/zoneinfo/zone.tab \
- && d --default-item "$default" --menu $"Select Time Zone" 0 0
$dh_menu "${list[@]}"; then
+ && d --default-item "$default" --menu $"Select time zone" 0 0
$dh_menu "${list[@]}"; then
if [ -n "$result" ]; then
JEOS_TIMEZONE="$result"
fi
else
- d --msgbox $"error setting timezone" 0 0
+ d --msgbox $"Error setting timezone" 0 0
fi
fi
systemd_firstboot_args+=("--timezone=$JEOS_TIMEZONE")
@@ -316,9 +311,9 @@
if [ -z "$JEOS_PASSWORD_ALREADY_SET" ]; then
while true; do
- d --insecure --passwordbox $"Enter root Password" 0 0
+ d --insecure --passwordbox $"Enter root password" 0 0
password="$result"
- d --insecure --passwordbox $"Confirm root Password" 0 0
+ d --insecure --passwordbox $"Confirm root password" 0 0
if [ "$password" != "$result" ]; then
d --msgbox $"Entered passwords don't match" 5 40
continue
@@ -354,26 +349,26 @@
#
shopt -s nullglob
-for p in /sys/class/net/* ; do
- test -f "$p" && continue # skip bonding_masters file
+for net_path in /sys/class/net/* ; do
+ test -f "$net_path" && continue # skip bonding_masters file
# Only devices having ID_NET_NAME.* attrs
# Ignore errors if udev not available
- udevadm info -q property -p "$p" 2>/dev/null | grep -qs ID_NET_NAME ||
continue
+ udevadm info -q property -p "$net_path" 2>/dev/null | grep -qs
ID_NET_NAME || continue
# But don't touch WLAN interfaces
- udevadm info -q property -p "$p" | grep -qs "DEVTYPE=wlan" && continue
+ udevadm info -q property -p "$net_path" | grep -qs "DEVTYPE=wlan" &&
continue
- d=${p##*/}
+ net_device=${net_path##*/}
unset IPADDR
- eval `wicked test dhcp4 "$d" 2>/dev/null | grep -E "^IPADDR="`
- ip link set down "$d" # set link down after probe once done
+ eval `wicked test dhcp4 "$net_device" 2>/dev/null | grep -E "^IPADDR="`
+ ip link set down "$net_device" # set link down after probe once done
# Create a configuration file for each interface that provides
# an IPADDR
if [ -n "$IPADDR" ]; then
printf "STARTMODE=auto\nBOOTPROTO=dhcp\n" \
- > "/etc/sysconfig/network/ifcfg-$d"
+ > "/etc/sysconfig/network/ifcfg-$net_device"
fi
done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jeos-firstboot-0.0+git20191127.be35ecb/files/usr/share/jeos-firstboot/raspberrywifi
new/jeos-firstboot-0.0+git20200226.95cfe28/files/usr/share/jeos-firstboot/raspberrywifi
---
old/jeos-firstboot-0.0+git20191127.be35ecb/files/usr/share/jeos-firstboot/raspberrywifi
2019-11-27 16:45:14.000000000 +0100
+++
new/jeos-firstboot-0.0+git20200226.95cfe28/files/usr/share/jeos-firstboot/raspberrywifi
2020-02-26 16:44:03.000000000 +0100
@@ -56,7 +56,7 @@
# interaction and access to the global systemd_firstboot_args array
raspberrywifi_systemd_firstboot()
{
- if is_raspberry && ls -d /sys/class/net/*/wireless &>/dev/null; then
+ if is_raspberry && stat -t /sys/class/net/*/wireless &> /dev/null; then
if dialog --yesno $"Configure wireless network?" 0 0; then
config_wireless=true
fi
@@ -79,7 +79,7 @@
wlan_device="${result}"
fi
- if raspberrywifi_get_wlan_networks && d --menu $"Select
Wireless network to connect" 0 0 $dh_menu "${list[@]}"; then
+ if raspberrywifi_get_wlan_networks && d --menu $"Select
wireless network to connect" 0 0 $dh_menu "${list[@]}"; then
wlan_network="$result"
else
if raspberrywifi_wlan_error $"Error listing wireless
networks"; then
@@ -134,26 +134,11 @@
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 ! run ifup $wlan_device &>/dev/null; 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
+ return 0
done
}
-
-# This is called after the configuration steps finished successfully
-raspberrywifi_post()
-{
- return 0
-}
