Hello community,
here is the log from the commit of package jeos-firstboot for openSUSE:Factory
checked in at 2020-03-11 18:44:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jeos-firstboot (Old)
and /work/SRC/openSUSE:Factory/.jeos-firstboot.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jeos-firstboot"
Wed Mar 11 18:44:28 2020 rev:32 rq:782986 version:0.0+git20200309.b23a6ef
Changes:
--------
--- /work/SRC/openSUSE:Factory/jeos-firstboot/jeos-firstboot.changes
2020-02-29 21:20:24.906029745 +0100
+++ /work/SRC/openSUSE:Factory/.jeos-firstboot.new.3160/jeos-firstboot.changes
2020-03-11 18:48:03.423477045 +0100
@@ -1,0 +2,6 @@
+Mon Mar 09 14:06:56 UTC 2020 - jeos-inter...@suse.de
+
+- Update to version 0.0+git20200309.b23a6ef:
+ * Add JEOS_EULA_ALREADY_AGREED option
+
+-------------------------------------------------------------------
Old:
----
jeos-firstboot-0.0+git20200226.95cfe28.tar.xz
New:
----
jeos-firstboot-0.0+git20200309.b23a6ef.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jeos-firstboot.spec ++++++
--- /var/tmp/diff_new_pack.99uEQj/_old 2020-03-11 18:48:05.551478351 +0100
+++ /var/tmp/diff_new_pack.99uEQj/_new 2020-03-11 18:48:05.551478351 +0100
@@ -17,7 +17,7 @@
Name: jeos-firstboot
-Version: 0.0+git20200226.95cfe28
+Version: 0.0+git20200309.b23a6ef
Release: 0
Summary: Simple text based JeOS first boot wizard
License: MIT
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.99uEQj/_old 2020-03-11 18:48:05.575478366 +0100
+++ /var/tmp/diff_new_pack.99uEQj/_new 2020-03-11 18:48:05.575478366 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">git://github.com/openSUSE/jeos-firstboot.git</param>
- <param
name="changesrevision">d2e38b4c0453f0d15932789be9d1850882bd704a</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">a078ddb80b90b6bb31895611f9eb17be2174eea3</param></service></servicedata>
\ No newline at end of file
++++++ jeos-firstboot-0.0+git20200226.95cfe28.tar.xz ->
jeos-firstboot-0.0+git20200309.b23a6ef.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jeos-firstboot-0.0+git20200226.95cfe28/files/usr/lib/jeos-firstboot
new/jeos-firstboot-0.0+git20200309.b23a6ef/files/usr/lib/jeos-firstboot
--- old/jeos-firstboot-0.0+git20200226.95cfe28/files/usr/lib/jeos-firstboot
2020-02-26 16:44:03.000000000 +0100
+++ new/jeos-firstboot-0.0+git20200309.b23a6ef/files/usr/lib/jeos-firstboot
2020-03-09 15:06:41.000000000 +0100
@@ -260,32 +260,34 @@
fi
fi
-# Find the location of the EULA
-# An EULA in /etc takes precedence
-EULA_FILE=/etc/YaST2/licenses/base/license.txt
-[ -e "${EULA_FILE}" ] || EULA_FILE=/usr/share/licenses/product/base/license.txt
+if [ -z "$JEOS_EULA_ALREADY_AGREED" ]; then
+ # Find the location of the EULA
+ # An EULA in /etc takes precedence
+ EULA_FILE=/etc/YaST2/licenses/base/license.txt
+ [ -e "${EULA_FILE}" ] ||
EULA_FILE=/usr/share/licenses/product/base/license.txt
-# Failsafe: If no license found, quit.
-if ! [ -e "$EULA_FILE" ]; then
- d --msgbox $"No license found - cannot continue" 6 40
- exit 1
-fi
+ # Failsafe: If no license found, quit.
+ if ! [ -e "$EULA_FILE" ]; then
+ d --msgbox $"No license found - cannot continue" 6 40
+ exit 1
+ fi
-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
+ 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
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/}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jeos-firstboot-0.0+git20200226.95cfe28/files/usr/share/defaults/jeos-firstboot.conf
new/jeos-firstboot-0.0+git20200309.b23a6ef/files/usr/share/defaults/jeos-firstboot.conf
---
old/jeos-firstboot-0.0+git20200226.95cfe28/files/usr/share/defaults/jeos-firstboot.conf
2020-02-26 16:44:03.000000000 +0100
+++
new/jeos-firstboot-0.0+git20200309.b23a6ef/files/usr/share/defaults/jeos-firstboot.conf
2020-03-09 15:06:41.000000000 +0100
@@ -16,3 +16,9 @@
# initial password for the root user will be skipped. In this case is
# expected that the root password was set by other means.
# JEOS_PASSWORD_ALREADY_SET='yes'
+
+# If set to a nonempty value, the dialog box for accepting the EULA
+# will be skipped. Use this option only when building images (ISO /
+# PXE / OEM) that are part of another product and than can be used
+# when this license was already accepted by other means.
+# JEOS_EULA_ALREADY_AGREED='yes'
