Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package fde-tools for openSUSE:Factory
checked in at 2023-08-28 17:12:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fde-tools (Old)
and /work/SRC/openSUSE:Factory/.fde-tools.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fde-tools"
Mon Aug 28 17:12:12 2023 rev:8 rq:1105563 version:0.6.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/fde-tools/fde-tools.changes 2023-08-18
19:29:26.551432473 +0200
+++ /work/SRC/openSUSE:Factory/.fde-tools.new.1766/fde-tools.changes
2023-08-28 17:12:19.622427876 +0200
@@ -1,0 +2,9 @@
+Thu Aug 24 07:45:13 UTC 2023 - Gary Ching-Pang Lin <g...@suse.com>
+
+- Update to version 0.6.8
+ + Improve the LUKS partition detection to support LUKS over LVM
+- Remove openssl and tpm2-0-tss-devel from BuildRequires since all
+ TPM related programs are already in pcr-oracle
+- Add util-linux-systemd to Requires for 'lsblk'
+
+-------------------------------------------------------------------
Old:
----
fde-tools-0.6.7.tar.gz
New:
----
fde-tools-0.6.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fde-tools.spec ++++++
--- /var/tmp/diff_new_pack.ZuCg1K/_old 2023-08-28 17:12:20.686466086 +0200
+++ /var/tmp/diff_new_pack.ZuCg1K/_new 2023-08-28 17:12:20.690466231 +0200
@@ -17,7 +17,7 @@
Name: fde-tools
-Version: 0.6.7
+Version: 0.6.8
Release: 0
Summary: Tools required for Full Disk Encryption
License: GPL-2.0-only
@@ -27,13 +27,12 @@
Source1: fde-tools.service
Patch: fde-tools-firstboot-alp-snapshot.patch
BuildRequires: help2man
-BuildRequires: openssl >= 0.9.8
-BuildRequires: tpm2-0-tss-devel
BuildRequires: pkgconfig(libcryptsetup)
BuildRequires: pkgconfig(libfido2)
Requires: cryptsetup
Requires: mokutil
Requires: pcr-oracle >= 0.4.5
+Requires: util-linux-systemd
ExclusiveArch: aarch64 s390x ppc64le x86_64 riscv64
%package -n fde-firstboot
++++++ fde-tools-0.6.7.tar.gz -> fde-tools-0.6.8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fde-tools-0.6.7/fde.sh new/fde-tools-0.6.8/fde.sh
--- old/fde-tools-0.6.7/fde.sh 2023-08-04 08:45:44.000000000 +0200
+++ new/fde-tools-0.6.8/fde.sh 2023-08-24 09:41:10.000000000 +0200
@@ -204,7 +204,6 @@
. "$SHAREDIR/commands/$command"
if cmd_requires_luks_device; then
- # FIXME: This code needs some love to make it work for LUKS-over-LVM
fsdev=$(luks_device_for_path /)
if [ ! -b "$fsdev" ]; then
fde_bad_argument "Unable to determine partition to operate on"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fde-tools-0.6.7/share/luks
new/fde-tools-0.6.8/share/luks
--- old/fde-tools-0.6.7/share/luks 2023-08-04 08:45:44.000000000 +0200
+++ new/fde-tools-0.6.8/share/luks 2023-08-24 09:41:10.000000000 +0200
@@ -50,7 +50,7 @@
path="$1"
- df "$path" | grep /dev/ | cut -f1 -d' '
+ df --output=source "$path" | grep /dev/
}
##################################################################
@@ -101,36 +101,17 @@
dev="/dev/mapper/$dm_name"
fi
- link=$(readlink "$dev")
+ # Trace back the block devices to locate the first device with
+ # 'crypto_LUKS' file system type
+ # - lsblk options
+ # -s: inverse dependencies
+ # -n: no header line
+ # -r: raw format
+ # -p: full device path
+ # -o: print only NAME and FSTYPE
+ dev_path=$(lsblk -snrp -o NAME,FSTYPE ${dev} | grep -m 1 crypto_LUKS | cut
-d' ' -f 1)
- # When using the LUKS volume directly to hold the root fs,
- # we'll be chasing be /dev/mapper/root -> dm-0 -> sdaN
- # When stacking LUKS + LVM, we're going to chase
- # /dev/mapper/root -> dm-1 -> dm-0 -> sdaN
- dev_name=$(basename "$link")
-
- # Turtles all the way down, but not indefinitely
- for i in $(seq 10); do
- vdir="/sys/devices/virtual/block/$dev_name"
- if [ ! -d "$vdir/slaves" ]; then
- break
- fi
-
- set -- $(ls "$vdir/slaves")
- if [ $# -ne 1 ]; then
- fde_trace "Ambiguous slave count for $dev_name"
- return 1
- fi
-
- dev_name="$1"
- done
-
- if [ -z "$dev_name" ]; then
- fde_trace "Failed to chase DM chain for $orig_dev"
- return 1
- fi
-
- echo "/dev/$dev_name"
+ echo "${dev_path}"
return 0
}
