Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package tik for openSUSE:Factory checked in
at 2024-06-11 18:29:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tik (Old)
and /work/SRC/openSUSE:Factory/.tik.new.19518 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tik"
Tue Jun 11 18:29:20 2024 rev:10 rq:1179827 version:1.0.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/tik/tik.changes 2024-06-03 17:41:04.601731144
+0200
+++ /work/SRC/openSUSE:Factory/.tik.new.19518/tik.changes 2024-06-11
18:30:23.319269010 +0200
@@ -1,0 +2,7 @@
+Mon Jun 10 18:44:51 UTC 2024 - rbr...@suse.com
+
+- Update to version 1.0.7:
+ * mig: always unmount the probed partition before mounting another
(boo#1226120)
+ * mig: wait for the encrypted device to appear, and relax luksClose
requirement on cleanup (boo#1225882)
+
+-------------------------------------------------------------------
Old:
----
tik-1.0.6.tar.xz
New:
----
tik-1.0.7.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tik.spec ++++++
--- /var/tmp/diff_new_pack.lRgHYY/_old 2024-06-11 18:30:24.267303677 +0200
+++ /var/tmp/diff_new_pack.lRgHYY/_new 2024-06-11 18:30:24.267303677 +0200
@@ -17,7 +17,7 @@
Name: tik
-Version: 1.0.6
+Version: 1.0.7
Release: 0
Summary: Transactional Installation Kit
License: MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.lRgHYY/_old 2024-06-11 18:30:24.303304993 +0200
+++ /var/tmp/diff_new_pack.lRgHYY/_new 2024-06-11 18:30:24.307305140 +0200
@@ -3,7 +3,7 @@
<service name="obs_scm" mode="localonly">
<param name="url">https://github.com/sysrich/tik.git</param>
<param name="scm">git</param>
- <param name="revision">v1.0.6</param>
+ <param name="revision">v1.0.7</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
++++++ tik-1.0.6.tar.xz -> tik-1.0.7.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tik-1.0.6/usr/lib/tik/modules/pre/20-mig
new/tik-1.0.7/usr/lib/tik/modules/pre/20-mig
--- old/tik-1.0.6/usr/lib/tik/modules/pre/20-mig 2024-05-31
10:29:47.000000000 +0200
+++ new/tik-1.0.7/usr/lib/tik/modules/pre/20-mig 2024-06-10
20:04:11.000000000 +0200
@@ -31,12 +31,10 @@
log "Legacy Aeon Install FOUND"
legacy_aeon=1
fi
- continue
- else
- continue
fi
+ prun-opt /usr/bin/umount ${mig_dir}/mnt
done
- prun-opt /usr/bin/umount ${mig_dir}/mnt
+
prun /usr/bin/rmdir ${mig_dir}/mnt
}
@@ -88,6 +86,13 @@
echo -n "${passphrase}" | prun /usr/sbin/cryptsetup luksOpen
/dev/disk/by-id/${encrypted_partition} crypt_${encrypted_partition}
if [ "${?}" -eq 0 ]; then
crypt_opened="${crypt_opened}
crypt_${encrypted_partition}"
+
+ # Wait for the mapped device to appear
+ wait_count=0
+ while [ ! -e /dev/mapper/crypt_${encrypted_partition} ]
&& [ ${wait_count} -lt 5 ]; do
+ sleep 1
+ wait_count=$((wait_count + 1))
+ done
break
fi
fi
@@ -186,7 +191,14 @@
if [ -n "${crypt_opened}" ]; then
for mapped_partition in ${crypt_opened}; do
if [ -e /dev/mapper/crypt_${encrypted_partition} ]; then
- prun /usr/sbin/cryptsetup luksClose
/dev/mapper/${mapped_partition}
+ # We are going to replace the encrypted partition anyway, so if
+ # we're unable to gracefully close the device after 5 seconds,
+ # just give up (hence the prun-opt usage)
+ wait_count=0
+ while ! prun-opt /usr/sbin/cryptsetup luksClose
/dev/mapper/${mapped_partition} && [ ${wait_count} -lt 5 ]; do
+ sleep 1
+ wait_count=$((wait_count + 1))
+ done
fi
done
fi
