Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package disk-encryption-tool for 
openSUSE:Factory checked in at 2026-01-22 15:12:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/disk-encryption-tool (Old)
 and      /work/SRC/openSUSE:Factory/.disk-encryption-tool.new.1928 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "disk-encryption-tool"

Thu Jan 22 15:12:20 2026 rev:19 rq:1328535 version:1+git20260121.010c05a

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/disk-encryption-tool/disk-encryption-tool.changes    
    2025-08-06 14:32:37.406354911 +0200
+++ 
/work/SRC/openSUSE:Factory/.disk-encryption-tool.new.1928/disk-encryption-tool.changes
      2026-01-22 15:12:40.006458530 +0100
@@ -1,0 +2,8 @@
+Wed Jan 21 14:16:18 UTC 2026 - Alberto Planas Dominguez <[email protected]>
+
+- Update to version 1+git20260121.010c05a:
+  * Remove x-growpart.grow flag for encrypted devices
+  * Requires combustion for firstboot.target
+  * Drop x-initrd.attach for cr_etc and cr_var
+
+-------------------------------------------------------------------

Old:
----
  disk-encryption-tool-1+git20250729.d86f79f.obscpio

New:
----
  disk-encryption-tool-1+git20260121.010c05a.obscpio

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

Other differences:
------------------
++++++ disk-encryption-tool.spec ++++++
--- /var/tmp/diff_new_pack.WtPGGp/_old  2026-01-22 15:12:42.278552972 +0100
+++ /var/tmp/diff_new_pack.WtPGGp/_new  2026-01-22 15:12:42.314554470 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package disk-encryption-tool
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2026 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,12 +18,13 @@
 
 
 Name:           disk-encryption-tool
-Version:        1+git20250729.d86f79f
+Version:        1+git20260121.010c05a
 Release:        0
 Summary:        Tool to reencrypt kiwi raw images
 License:        MIT
 URL:            https://github.com/openSUSE/disk-encryption-tool
 Source:         disk-encryption-tool-%{version}.tar
+Requires:       combustion
 Requires:       cryptsetup
 Requires:       keyutils
 ExclusiveArch:  aarch64 riscv64 x86_64

++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.WtPGGp/_old  2026-01-22 15:12:42.862577248 +0100
+++ /var/tmp/diff_new_pack.WtPGGp/_new  2026-01-22 15:12:42.946580740 +0100
@@ -1,6 +1,6 @@
 <servicedata>
 <service name="tar_scm">
                 <param 
name="url">https://github.com/openSUSE/disk-encryption-tool.git</param>
-              <param 
name="changesrevision">d86f79ff1eb1ee11b3048eb9a457993f274b40fa</param></service></servicedata>
+              <param 
name="changesrevision">010c05a3e9ed2ac56afce96542ed2cb33a804668</param></service></servicedata>
 (No newline at EOF)
 

++++++ disk-encryption-tool-1+git20250729.d86f79f.obscpio -> 
disk-encryption-tool-1+git20260121.010c05a.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/disk-encryption-tool-1+git20250729.d86f79f/disk-encryption-tool 
new/disk-encryption-tool-1+git20260121.010c05a/disk-encryption-tool
--- old/disk-encryption-tool-1+git20250729.d86f79f/disk-encryption-tool 
2025-07-29 18:18:22.000000000 +0200
+++ new/disk-encryption-tool-1+git20260121.010c05a/disk-encryption-tool 
2026-01-21 15:09:25.000000000 +0100
@@ -329,12 +329,13 @@
        opts=
        if [ -z "$crypttab_options" ] || [ "$crypttab_options" = "auto" ]; then
                # cr_root and cr_etc are mounted early, in the
-               # initrd. For some reason cr_var too, event if in
-               # Tumbleweed should be mounted later (early after the
-               # switch root)
+               # initrd. In openSUSE cr_var too because of the
+               # SELinux relaveling.  Technically we do not need
+               # x-initrd.attach here, as dracut is now able to
+               # recognize this.
                #
                # https://systemd.io/MOUNT_REQUIREMENTS/
-               if [ "$cr_name" = "cr_root" ] || [ "$cr_name" = "cr_etc" ] || [ 
"$cr_name" = "cr_var" ]; then
+               if [ "$cr_name" = "cr_root" ]; then
                        opts="x-initrd.attach"
                fi
        elif [ "$crypttab_options" != "none" ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/disk-encryption-tool-1+git20250729.d86f79f/disk-encryption-tool-dracut 
new/disk-encryption-tool-1+git20260121.010c05a/disk-encryption-tool-dracut
--- old/disk-encryption-tool-1+git20250729.d86f79f/disk-encryption-tool-dracut  
2025-07-29 18:18:22.000000000 +0200
+++ new/disk-encryption-tool-1+git20260121.010c05a/disk-encryption-tool-dracut  
2026-01-21 15:09:25.000000000 +0100
@@ -23,6 +23,23 @@
        readarray -t "$var" < "$CREDENTIALS_DIRECTORY/$name" || [ -n "${!var}" ]
 }
 
+clean_growpart_flag()
+{
+       local dev="$1"
+       local fstab_dev real_dev
+       for mnt in $(findmnt --tab-file /sysroot/etc/fstab --options 
x-growpart.grow --output TARGET --noheadings); do
+               fstab_dev="$(findmnt --tab-file /sysroot/etc/fstab --target 
"$mnt" --output SOURCE --noheadings)"
+               real_dev="$(findmnt --tab-file /sysroot/etc/fstab --target 
"$mnt" --evaluate --real --output SOURCE --noheadings)"
+               [ "$dev" = "$real_dev" ] && break
+               fstab_dev=
+       done
+       if [ -n "$fstab_dev" ]; then
+               mount -o remount,rw /sysroot
+               sed -i -E 
"/^${fstab_dev}/s/,x-growpart.grow|x-growpart.grow,//g" /sysroot/etc/fstab
+               mount -o remount,ro /sysroot
+       fi
+}
+
 encrypt=
 if get_credential encrypt disk-encryption-tool-dracut.encrypt && [ "$encrypt" 
= "no" ]; then
        exit 0
@@ -61,11 +78,13 @@
                        [ "$device" = "$root_device" ] && 
root_cr_name="$cr_name" && root_options="$options" && continue
                        echo "Encrypt $device"
                        /usr/bin/disk-encryption-tool --keyring cryptenroll 
--options "${options:-auto}" --root /sysroot "$device" "$cr_name" || die 
"Encryption failed"
+                       clean_growpart_flag "$device"
                done
        fi
        if [ "$root_options" != "skip" ]; then
                echo "Encrypt /sysroot"
                /usr/bin/disk-encryption-tool --keyring cryptenroll --options 
"${root_options:-auto}" "/sysroot" "$root_cr_name" || die "Encryption failed"
+               clean_growpart_flag "$root_device"
        fi
 fi
 # turn messages on again
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/disk-encryption-tool-1+git20250729.d86f79f/disk-encryption-tool.spec 
new/disk-encryption-tool-1+git20260121.010c05a/disk-encryption-tool.spec
--- old/disk-encryption-tool-1+git20250729.d86f79f/disk-encryption-tool.spec    
2025-07-29 18:18:22.000000000 +0200
+++ new/disk-encryption-tool-1+git20260121.010c05a/disk-encryption-tool.spec    
2026-01-21 15:09:25.000000000 +0100
@@ -23,6 +23,7 @@
 License:        MIT
 URL:            https://github.com/openSUSE/disk-encryption-tool
 Source:         disk-encryption-tool-%{version}.tar
+Requires:       combustion
 Requires:       cryptsetup
 Requires:       keyutils
 ExclusiveArch:  aarch64 riscv64 x86_64

++++++ disk-encryption-tool.obsinfo ++++++
--- /var/tmp/diff_new_pack.WtPGGp/_old  2026-01-22 15:12:43.810616654 +0100
+++ /var/tmp/diff_new_pack.WtPGGp/_new  2026-01-22 15:12:43.842617985 +0100
@@ -1,5 +1,5 @@
 name: disk-encryption-tool
-version: 1+git20250729.d86f79f
-mtime: 1753805902
-commit: d86f79ff1eb1ee11b3048eb9a457993f274b40fa
+version: 1+git20260121.010c05a
+mtime: 1769004565
+commit: 010c05a3e9ed2ac56afce96542ed2cb33a804668
 

Reply via email to