Hello community, here is the log from the commit of package jeos-firstboot for openSUSE:Factory checked in at 2019-03-18 10:34:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jeos-firstboot (Old) and /work/SRC/openSUSE:Factory/.jeos-firstboot.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jeos-firstboot" Mon Mar 18 10:34:45 2019 rev:22 rq:685378 version:0.0+git20190315.4a7660d Changes: -------- --- /work/SRC/openSUSE:Factory/jeos-firstboot/jeos-firstboot.changes 2019-02-27 15:05:20.522461569 +0100 +++ /work/SRC/openSUSE:Factory/.jeos-firstboot.new.28833/jeos-firstboot.changes 2019-03-18 10:34:53.711537528 +0100 @@ -1,0 +2,7 @@ +Fri Mar 15 13:56:27 UTC 2019 - [email protected] + +- Update to version 0.0+git20190315.4a7660d: + * Support the non-standard and hopefully temporary location for the SLE EULAs + (works around jsc#SLE-3067 and fixes bsc#1127166) + +------------------------------------------------------------------- Old: ---- jeos-firstboot-0.0+git20190222.ccc0ad8.tar.xz New: ---- jeos-firstboot-0.0+git20190315.4a7660d.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jeos-firstboot.spec ++++++ --- /var/tmp/diff_new_pack.G6SsyI/_old 2019-03-18 10:34:54.383537360 +0100 +++ /var/tmp/diff_new_pack.G6SsyI/_new 2019-03-18 10:34:54.387537359 +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 https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: jeos-firstboot -Version: 0.0+git20190222.ccc0ad8 +Version: 0.0+git20190315.4a7660d Release: 0 Summary: Simple text based JeOS first boot wizard License: MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.G6SsyI/_old 2019-03-18 10:34:54.423537350 +0100 +++ /var/tmp/diff_new_pack.G6SsyI/_new 2019-03-18 10:34:54.427537349 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/jeos-firstboot.git</param> - <param name="changesrevision">64167ba4a4bdc47dae4e9ba0d050a36dae4889af</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">f801d5c048ff6cfe158986ae167dd16f35dbcc18</param></service></servicedata> \ No newline at end of file ++++++ jeos-firstboot-0.0+git20190222.ccc0ad8.tar.xz -> jeos-firstboot-0.0+git20190315.4a7660d.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jeos-firstboot-0.0+git20190222.ccc0ad8/files/usr/lib/jeos-firstboot new/jeos-firstboot-0.0+git20190315.4a7660d/files/usr/lib/jeos-firstboot --- old/jeos-firstboot-0.0+git20190222.ccc0ad8/files/usr/lib/jeos-firstboot 2019-02-22 13:27:42.000000000 +0100 +++ new/jeos-firstboot-0.0+git20190315.4a7660d/files/usr/lib/jeos-firstboot 2019-03-15 14:55:18.000000000 +0100 @@ -26,8 +26,6 @@ . /etc/os-release . "$0-functions" -EULA_FILE=/etc/YaST2/licenses/base/license.txt - stty_size() { set -- `stty size`; LINES=$1; COLUMNS=$2 # stty size can return zero when not ready or @@ -236,6 +234,22 @@ fi fi +# Find the location of the EULA +# An EULA in /etc takes precedence (this also works for openSUSE, so no specific code for that) +EULA_FILE=/etc/YaST2/licenses/base/license.txt + +if [ ! -e "${EULA_FILE}" ]; then + # SLE moved it to a different non-standard location, which is not directly visible. + # So try to infer it using the baseproduct link. + EULA_FILE="/usr/share/licenses/product/$(basename -s .prod $(readlink /etc/products.d/baseproduct))/license.txt" +fi + +# 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 + 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}.$locale.txt" \
