Hello community, here is the log from the commit of package jeos-firstboot for openSUSE:Factory checked in at 2019-03-24 14:56:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jeos-firstboot (Old) and /work/SRC/openSUSE:Factory/.jeos-firstboot.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jeos-firstboot" Sun Mar 24 14:56:50 2019 rev:23 rq:686452 version:0.0+git20190319.e7555da Changes: -------- --- /work/SRC/openSUSE:Factory/jeos-firstboot/jeos-firstboot.changes 2019-03-18 10:34:53.711537528 +0100 +++ /work/SRC/openSUSE:Factory/.jeos-firstboot.new.25356/jeos-firstboot.changes 2019-03-24 14:56:51.751202942 +0100 @@ -1,0 +2,9 @@ +Tue Mar 19 15:09:11 UTC 2019 - [email protected] + +- Update to version 0.0+git20190319.e7555da: + * Use the base symlink for the new location + * Correct if statement coding style + * Remove unneeded comment from new if block + * Test if snapper exists before trying to run it + +------------------------------------------------------------------- Old: ---- jeos-firstboot-0.0+git20190315.4a7660d.tar.xz New: ---- jeos-firstboot-0.0+git20190319.e7555da.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jeos-firstboot.spec ++++++ --- /var/tmp/diff_new_pack.VKOPer/_old 2019-03-24 14:56:52.671202846 +0100 +++ /var/tmp/diff_new_pack.VKOPer/_new 2019-03-24 14:56:52.675202845 +0100 @@ -17,7 +17,7 @@ Name: jeos-firstboot -Version: 0.0+git20190315.4a7660d +Version: 0.0+git20190319.e7555da Release: 0 Summary: Simple text based JeOS first boot wizard License: MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.VKOPer/_old 2019-03-24 14:56:52.699202842 +0100 +++ /var/tmp/diff_new_pack.VKOPer/_new 2019-03-24 14:56:52.699202842 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/jeos-firstboot.git</param> - <param name="changesrevision">f801d5c048ff6cfe158986ae167dd16f35dbcc18</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">e7555daddb18fd6ad1a57bdc3903be6ec5958fe5</param></service></servicedata> \ No newline at end of file ++++++ jeos-firstboot-0.0+git20190315.4a7660d.tar.xz -> jeos-firstboot-0.0+git20190319.e7555da.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jeos-firstboot-0.0+git20190315.4a7660d/files/usr/lib/jeos-firstboot new/jeos-firstboot-0.0+git20190319.e7555da/files/usr/lib/jeos-firstboot --- old/jeos-firstboot-0.0+git20190315.4a7660d/files/usr/lib/jeos-firstboot 2019-03-15 14:55:18.000000000 +0100 +++ new/jeos-firstboot-0.0+git20190319.e7555da/files/usr/lib/jeos-firstboot 2019-03-19 16:01:45.000000000 +0100 @@ -235,14 +235,9 @@ fi # Find the location of the EULA -# An EULA in /etc takes precedence (this also works for openSUSE, so no specific code for that) +# An EULA in /etc takes precedence 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 +[ -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 @@ -470,15 +465,18 @@ run sed -i -e "s/LOADER_TYPE=.*/LOADER_TYPE=grub2/g" /etc/sysconfig/bootloader fi -# Run snapper to setup quota for btrfs -run /usr/bin/snapper --no-dbus setup-quota || warn $"Could not setup quota for btrfs" +# Test if snapper is available +if [ -x /usr/bin/snapper ]; then + # Run snapper to setup quota for btrfs + run /usr/bin/snapper --no-dbus setup-quota || warn $"Could not setup quota for btrfs" -#d --infobox "Creating snapshot ..." 3 40 || true -#run snapper --no-dbus -v create -d "Initial Status" --userdata "important=yes" || d --msgbox "snapper failed" 0 0 || true -if [ ! -e /.snapshots/2 ]; then - run create_snapshot 2 "Initial Status" "yes" || true + if [ ! -e /.snapshots/2 ]; then + run create_snapshot 2 "Initial Status" "yes" || true + fi + if [ -x /usr/lib/snapper/plugins/grub ]; then + run /usr/lib/snapper/plugins/grub --refresh + fi fi -run /usr/lib/snapper/plugins/grub --refresh if [ "$config_wireless" = "true" ]; then run ifdown $wlan_device 2>/dev/null || true
