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-05-15 21:29:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tik (Old)
and /work/SRC/openSUSE:Factory/.tik.new.1880 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tik"
Wed May 15 21:29:32 2024 rev:3 rq:1174269 version:0.9.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/tik/tik.changes 2024-05-13 17:59:14.800446975
+0200
+++ /work/SRC/openSUSE:Factory/.tik.new.1880/tik.changes 2024-05-15
21:29:47.112516475 +0200
@@ -1,0 +2,13 @@
+Wed May 15 13:51:15 UTC 2024 - rbr...@suse.com
+
+- Update to version 0.9.4:
+ * module-mig: backup nested btrfs subvolumes and groups also
+ * module-mig: Also backup/restore subgid/subuid
+
+-------------------------------------------------------------------
+Tue May 14 13:59:51 UTC 2024 - rbr...@suse.com
+
+- Update to version 0.9.3:
+ * module-mig: chmod copy of AccountsService/users so it can be properly
copied and cleaned up
+
+-------------------------------------------------------------------
Old:
----
tik-0.9.2.tar.xz
New:
----
tik-0.9.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tik.spec ++++++
--- /var/tmp/diff_new_pack.6tgVij/_old 2024-05-15 21:29:47.688537323 +0200
+++ /var/tmp/diff_new_pack.6tgVij/_new 2024-05-15 21:29:47.688537323 +0200
@@ -17,7 +17,7 @@
Name: tik
-Version: 0.9.2
+Version: 0.9.4
Release: 0
Summary: Transactional Installation Kit
License: MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.6tgVij/_old 2024-05-15 21:29:47.716538337 +0200
+++ /var/tmp/diff_new_pack.6tgVij/_new 2024-05-15 21:29:47.720538481 +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">v0.9.2</param>
+ <param name="revision">v0.9.4</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
++++++ tik-0.9.2.tar.xz -> tik-0.9.4.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tik-0.9.2/usr/lib/tik/modules/post/20-mig
new/tik-0.9.4/usr/lib/tik/modules/post/20-mig
--- old/tik-0.9.2/usr/lib/tik/modules/post/20-mig 2024-05-13
16:37:45.000000000 +0200
+++ new/tik-0.9.4/usr/lib/tik/modules/post/20-mig 2024-05-15
15:38:35.000000000 +0200
@@ -16,9 +16,12 @@
prun /lib/systemd/systemd-growfs ${mig_dir}/mnt/var
etcmountcmd=$(cat ${mig_dir}/mnt/etc/fstab | grep "overlay /etc" | sed
's/\/sysroot\//${mig_dir}\/mnt\//g' | sed 's/\/work-etc.*/\/work-etc
${mig_dir}\/mnt\/etc\//' | sed 's/overlay \/etc overlay/\/usr\/bin\/mount -t
overlay overlay -o/')
eval prun "$etcmountcmd"
- prun /usr/bin/cat ${mig_dir}/passwd.out | prun tee -a
${mig_dir}/mnt/etc/passwd
+ prun /usr/bin/cat ${mig_dir}/passwd.out | prun tee -a
${mig_dir}/mnt/etc/passwd
+ prun /usr/bin/cat ${mig_dir}/group.out | prun tee -a
${mig_dir}/mnt/etc/group
prun /usr/bin/cat ${mig_dir}/shadow.out | prun tee -a
${mig_dir}/mnt/etc/shadow
prun /usr/bin/sed -i "/^wheel:/ s/$/$(head -n 1 ${mig_dir}/passwd.out |
awk -F'[/:]' '{print $1}')/" ${mig_dir}/mnt/etc/group
+ prun /usr/bin/cp -a ${mig_dir}/subuid ${mig_dir}/mnt/etc/subuid
+ prun /usr/bin/cp -a ${mig_dir}/subgid ${mig_dir}/mnt/etc/subgid
# It's not guaranteed that the system will have existing network
configs, localtime or AccountsService
prun-opt /usr/bin/cp -a ${mig_dir}/system-connections/*
${mig_dir}/mnt/etc/NetworkManager/system-connections
prun-opt /usr/bin/cp -a ${mig_dir}/localtime
${mig_dir}/mnt/etc/localtime
@@ -32,6 +35,13 @@
(prun /usr/sbin/btrfs send ${mig_dir}/${snap_dir} | pv -f -F "# %b
copied in %t %r" | prun /usr/sbin/btrfs receive ${mig_dir}/mnt) 2>&1 | d
--progress --title="Restoring /home" --pulsate --auto-close --no-cancel
--width=400
prun /usr/bin/mv ${mig_dir}/mnt/${snap_dir} ${mig_dir}/mnt/home
prun /usr/sbin/btrfs property set -f -ts ${mig_dir}/mnt/home ro false
+ for subsubvol in $(prun-opt /usr/sbin/btrfs subvolume list -o
${mig_dir}/${snap_dir} --sort=path | rev | cut -f1 -d' ' | rev | sed 's/^@//');
do
+ subsubvolname=$(basename $subsubvol)
+ subsubdirname=$(dirname $subsubvol | awk -F
"${mig_dir}/${snap_dir}" '{print $2}')
+ (prun /usr/sbin/btrfs send ${subsubvol} | pv -f -F "# %b copied
in %t %r" | prun /usr/sbin/btrfs receive ${mig_dir}/mnt/home/${subsubdirname} )
2>&1 | d --progress --title="Restoring containers" --pulsate --auto-close
--no-cancel --width=400
+ prun /usr/sbin/btrfs property set -f -ts
${mig_dir}/mnt/home/${subsubdirname}/${subsubvolname} ro false
+
+ done
# TODO - probe restored home directories, find a marker as to whether
aeon-firstboot has run, if not, then copy the desktop from the systems skel to
there.
prun /usr/bin/umount ${mig_dir}/mnt
prun /usr/bin/rmdir ${mig_dir}/mnt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tik-0.9.2/usr/lib/tik/modules/pre/20-mig
new/tik-0.9.4/usr/lib/tik/modules/pre/20-mig
--- old/tik-0.9.2/usr/lib/tik/modules/pre/20-mig 2024-05-13
16:37:45.000000000 +0200
+++ new/tik-0.9.4/usr/lib/tik/modules/pre/20-mig 2024-05-15
15:38:35.000000000 +0200
@@ -50,6 +50,10 @@
migrate=1
log "backup skipped, migration will use existing backup"
else
+ prun-opt /usr/sbin/btrfs property set -f -ts ${mig_dir}/${snap_dir} ro
false
+ for subsubvol in $(prun-opt /usr/sbin/btrfs subvolume list -o
${mig_dir}/${snap_dir} --sort=path | rev | cut -f1 -d' ' | rev | sed "s/^@//");
do
+ prun /usr/sbin/btrfs subvolume delete ${subsubvol}
+ done
prun-opt /usr/sbin/btrfs subvolume delete ${mig_dir}/${snap_dir}
prun-opt /usr/bin/rm ${mig_dir}/*.out
prun-opt /usr/bin/rm ${mig_dir}/system-connections/*
@@ -59,6 +63,9 @@
prun-opt /usr/bin/rm ${mig_dir}/icons/*
prun-opt /usr/bin/rmdir ${mig_dir}/icons
prun-opt /usr/bin/rm ${mig_dir}/localtime
+ prun-opt /usr/bin/rm ${mig_dir}/subgid
+ prun-opt /usr/bin/rm ${mig_dir}/subuid
+ prun-opt /usr/bin/rmdir ${mig_dir}/mnt
fi
fi
@@ -112,17 +119,33 @@
prun /usr/sbin/btrfs subvolume snapshot -r ${mig_dir}/mnt
${mig_dir}/mnt/${snap_dir}
(prun /usr/sbin/btrfs send ${mig_dir}/mnt/${snap_dir} | pv -f -F "# %b
copied in %t %r" | prun /usr/sbin/btrfs receive ${mig_dir}) 2>&1 | d --progress
--title="Backing up /home" --pulsate --auto-close --no-cancel --width=400
prun /usr/sbin/btrfs subvolume delete ${mig_dir}/mnt/${snap_dir}
+ # Probe for subvolumes nested beneath /home and back them up also
+ if (prun-opt /usr/sbin/btrfs subvolume list -o ${mig_dir}/mnt | grep
-q "ID "); then
+ prun /usr/sbin/btrfs property set -f -ts ${mig_dir}/${snap_dir} ro false
+ for subsubvol in $(prun-opt /usr/sbin/btrfs subvolume list -o
${mig_dir}/mnt --sort=path | rev | cut -f1 -d' ' | rev | sed 's/^@\/home//'); do
+ subsubvolname=$(basename $subsubvol)
+ subsubdirname=$(dirname $subsubvol)
+ prun /usr/sbin/btrfs subvolume snapshot -r
${mig_dir}/mnt/${subsubvol} ${mig_dir}/mnt/${subsubvolname}
+ (prun /usr/sbin/btrfs send
${mig_dir}/mnt/${subsubvolname} | pv -f -F "# %b copied in %t %r" | prun
/usr/sbin/btrfs receive ${mig_dir}/${snap_dir}/${subsubdirname}) 2>&1 | d
--progress --title="Backing up containers" --pulsate --auto-close --no-cancel
--width=400
+ prun /usr/sbin/btrfs subvolume delete
${mig_dir}/mnt/${subsubvolname}
+ done
+ prun /usr/sbin/btrfs property set -f -ts ${mig_dir}/${snap_dir} ro true
+ fi
prun /usr/bin/umount ${mig_dir}/mnt
prun /usr/bin/mount -o compress=zstd:1 ${probedpart} ${mig_dir}/mnt
prun /usr/bin/mount -o compress=zstd:1,subvol=/@/var ${probedpart}
${mig_dir}/mnt/var
etcmntcmd=$(cat ${mig_dir}/mnt/etc/fstab | grep "overlay /etc" | sed
's/\/sysroot\//${mig_dir}\/mnt\//g' | sed 's/\/work-etc.*/\/work-etc
${mig_dir}\/mnt\/etc\//' | sed 's/overlay \/etc overlay/\/usr\/bin\/mount -t
overlay overlay -o/')
eval prun "$etcmntcmd"
prun /usr/bin/awk -F'[/:]' '($3 >= 1000 && $3 != 65534)'
${mig_dir}/mnt/etc/passwd | prun tee ${mig_dir}/passwd.out
+ prun /usr/bin/awk -F'[/:]' '($3 >= 1000 && $3 != 65534 && $3 != 65533)'
${mig_dir}/mnt/etc/group | prun tee ${mig_dir}/group.out
prun /usr/bin/awk -F'[/:]' '{if ($3 >= 1000 && $3 != 65534) print $1}'
${mig_dir}/mnt/etc/passwd | prun /usr/bin/grep -f - ${mig_dir}/mnt/etc/shadow |
prun tee ${mig_dir}/shadow.out
+ prun /usr/bin/cp -a ${mig_dir}/mnt/etc/subuid ${mig_dir}/subuid
+ prun /usr/bin/cp -a ${mig_dir}/mnt/etc/subgid ${mig_dir}/subgid
# It's not guaranteed that the system will have existing network
configs, custom localtime or AccountsService
prun-opt /usr/bin/cp -a
${mig_dir}/mnt/etc/NetworkManager/system-connections
${mig_dir}/system-connections
prun-opt /usr/bin/cp -a ${mig_dir}/mnt/etc/localtime
${mig_dir}/localtime
prun-opt /usr/bin/cp -a ${mig_dir}/mnt/var/lib/AccountsService/users
${mig_dir}/users
+ prun-opt /usr/bin/chmod 744 ${mig_dir}/users
prun-opt /usr/bin/cp -a ${mig_dir}/mnt/var/lib/AccountsService/icons
${mig_dir}/icons
prun /usr/bin/umount ${mig_dir}/mnt/etc
prun /usr/bin/umount ${mig_dir}/mnt/var
