Hello community,

here is the log from the commit of package transactional-update for 
openSUSE:Factory checked in at 2019-07-22 12:17:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/transactional-update (Old)
 and      /work/SRC/openSUSE:Factory/.transactional-update.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "transactional-update"

Mon Jul 22 12:17:17 2019 rev:44 rq:714110 version:2.15

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/transactional-update/transactional-update.changes    
    2019-05-02 19:14:55.297104837 +0200
+++ 
/work/SRC/openSUSE:Factory/.transactional-update.new.4126/transactional-update.changes
      2019-07-22 12:17:18.619713120 +0200
@@ -1,0 +2,10 @@
+Wed Jun  5 15:15:09 UTC 2019 - Ignaz Forster <ifors...@suse.com>
+
+- Update to version 2.15
+  - Move description of interactiveness [boo#1132438]
+  - Enable network during update [boo#1137890]
+  - Add compatibilty with new overlayfs versions [boo#1140057]
+  - Allow updates of the bootloader on EFI systems [boo#1139015]
+  - Add support for /boot/writable [boo#1138725]
+
+-------------------------------------------------------------------

Old:
----
  transactional-update-2.14.2.tar.gz

New:
----
  transactional-update-2.15.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ transactional-update.spec ++++++
--- /var/tmp/diff_new_pack.UkwDP9/_old  2019-07-22 12:17:19.411712905 +0200
+++ /var/tmp/diff_new_pack.UkwDP9/_new  2019-07-22 12:17:19.423712901 +0200
@@ -12,14 +12,13 @@
 # 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:           transactional-update
-Version:        2.14.2
+Version:        2.15
 Release:        0
-# test
 Summary:        Transactional Updates with btrfs and snapshots
 License:        GPL-2.0-or-later
 Group:          System/Base

++++++ transactional-update-2.14.2.tar.gz -> transactional-update-2.15.tar.gz 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/transactional-update-2.14.2/NEWS 
new/transactional-update-2.15/NEWS
--- old/transactional-update-2.14.2/NEWS        2019-04-29 14:15:30.000000000 
+0200
+++ new/transactional-update-2.15/NEWS  2019-07-08 14:57:13.000000000 +0200
@@ -2,6 +2,13 @@
 
 Copyright (C) 2016-2019 Thorsten Kukuk et al.
 
+Version 2.15
+* Move description of interactiveness [boo#1132438]
+* Enable network during update [boo#1137890]
+* Add compatibilty with new overlayfs versions [boo#1140057]
+* Allow updates of the bootloader on EFI systems [boo#1139015]
+* Add support for /boot/writable [boo#1126900]
+
 Version 2.14.2
 * Prevent unnecessary error message on systems not installed with YaST (e.g.
   KIWI)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/transactional-update-2.14.2/configure.ac 
new/transactional-update-2.15/configure.ac
--- old/transactional-update-2.14.2/configure.ac        2019-04-29 
14:15:30.000000000 +0200
+++ new/transactional-update-2.15/configure.ac  2019-07-08 14:57:13.000000000 
+0200
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(transactional-update, 2.14.2)
+AC_INIT(transactional-update, 2.15)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([sbin/transactional-update.in])
 AC_PREFIX_DEFAULT(/usr)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/transactional-update-2.14.2/sbin/transactional-update.in 
new/transactional-update-2.15/sbin/transactional-update.in
--- old/transactional-update-2.14.2/sbin/transactional-update.in        
2019-04-29 14:15:30.000000000 +0200
+++ new/transactional-update-2.15/sbin/transactional-update.in  2019-07-08 
14:57:13.000000000 +0200
@@ -129,6 +129,7 @@
     echo "reboot                 Reboot after update"
     echo ""
     echo "Package Commands:"
+    echo "Defaults: (i) interactive command; (n) non-interactive command"
     echo "dup                    Call 'zypper dup' (n)"
     echo "up                     Call 'zypper up' (n)"
     echo "patch                  Call 'zypper patch' (n)"
@@ -136,7 +137,6 @@
     echo "pkg install ...        Install individual packages (i)"
     echo "pkg remove ...         Remove individual packages (i)"
     echo "pkg update ...         Updates individual packages (i)"
-    echo "Defaults: (i) interactive command; (n) non-interactive command"
     echo ""
     echo "Standalone Commands:"
     echo "rollback [<number>]    Set the current or given snapshot as default 
snapshot"
@@ -301,6 +301,7 @@
     if [ ${HAS_SEPARATE_VAR} -eq 1 ]; then
        rm -rf ${SNAPSHOT_DIR}/var/tmp
        rm -rf ${SNAPSHOT_DIR}/var/lib/zypp
+       rm -rf ${SNAPSHOT_DIR}/var/run
     fi
 
     # Unmount everything we don't need anymore:
@@ -495,10 +496,26 @@
 
 # Sync /etc mount contents to target directory
 sync_etc() {
-    log_info "Syncing /etc of oldest snapshot $1 as base into new snapshot $2"
+    local mount_opts overlay_id current_upper
+
+    get_etc_overlay_from /
+    current_upper="${fstab_upper}"
     get_etc_overlay_from "$1"
+
+    # After fresh installations there's no overlay to sync yet
+    if [ ${#fstab_lowerdirs[@]} -le 1 ]; then
+       return
+    fi
+    log_info "Syncing /etc of oldest snapshot $1 as base into new snapshot $2"
+
     mount_opts="defaults,"
-    mount_opts+="lowerdir=${fstab_upper#/sysroot}:"
+    mount_opts+="lowerdir="
+    # Special case: If the current in-use snapshot is the oldest snapshot
+    # already it will be added as a lowerdir, so don't mount it for
+    # syncing (it may change at any time anyway).
+    if [ "${fstab_upper}" != "${current_upper}" ]; then
+       mount_opts+="${fstab_upper#/sysroot}:"
+    fi
     # Replace all /sysroot prefixes; for /var it can simply be removed, the
     # remaining root file system has to be replaced with the oldest snapshot
     fstab_lowerdirs=("${fstab_lowerdirs[@]///sysroot\/var//var}")
@@ -1046,11 +1063,18 @@
        if [ ${RUN_SHELL} -eq 1 ]; then
            DIR_TO_MOUNT="${DIR_TO_MOUNT} root"
        fi
+       if [ -d /boot/writable ]; then
+           DIR_TO_MOUNT="${DIR_TO_MOUNT} /boot/writable"
+       fi
     fi
 
     # Check which directories in /boot/grub2 need to be mounted,
     # otherwise grub2 will not boot after a version update.
     DIR_TO_MOUNT="${DIR_TO_MOUNT} $(awk '$2 ~ /^\/boot\/grub2\// { print $2 }' 
/proc/mounts)"
+    # On EFI systems the EFI partition is also needed
+    if [ -e /boot/efi ]; then
+       DIR_TO_MOUNT="${DIR_TO_MOUNT} /boot/efi"
+    fi
 
     # Mount everything we need:
     mount -t proc none ${SNAPSHOT_DIR}/proc
@@ -1113,6 +1137,12 @@
        ln -sf ../../usr/lib/sysimage/rpm ${SNAPSHOT_DIR}/var/lib/rpm
     fi
 
+    # Copy network configuration into chroot
+    if [ -e /var/run/netconfig ]; then
+       mkdir -p ${SNAPSHOT_DIR}/var/run
+       cp -r /var/run/netconfig ${SNAPSHOT_DIR}/var/run/
+    fi
+
     # Do we need to cleanup the /var/cache directory?
     if [ ! -d ${SNAPSHOT_DIR}/var/cache/zypp ]; then
        VAR_CACHE_CLEANUP=1


Reply via email to