Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package dracut for openSUSE:Factory checked
in at 2022-04-14 17:24:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dracut (Old)
and /work/SRC/openSUSE:Factory/.dracut.new.1941 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut"
Thu Apr 14 17:24:19 2022 rev:188 rq:969485 version:056+suse.268.g0b2bd662
Changes:
--------
--- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2022-04-09
01:44:01.822748617 +0200
+++ /work/SRC/openSUSE:Factory/.dracut.new.1941/dracut.changes 2022-04-14
17:24:37.083203961 +0200
@@ -1,0 +2,9 @@
+Tue Apr 12 10:49:53 UTC 2022 - antonio.fei...@suse.com
+
+- Update to version 056+suse.268.g0b2bd662:
+ * fix(resume): do not add this module if there is no suitable swap
(bsc#1198095)
+ * feat(resume): improve sanity check by verifying volatile swap (bsc#1198095)
+ * fix(resume): correct call to block_is_netdevice function (bsc#1197737)
+ * fix(lvm): add missing grep requirement (bsc#1198271)
+
+-------------------------------------------------------------------
Old:
----
dracut-056+suse.261.gf83268d5.obscpio
New:
----
dracut-056+suse.268.g0b2bd662.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.5M8o8k/_old 2022-04-14 17:24:38.043205083 +0200
+++ /var/tmp/diff_new_pack.5M8o8k/_new 2022-04-14 17:24:38.047205088 +0200
@@ -25,7 +25,7 @@
%endif
Name: dracut
-Version: 056+suse.261.gf83268d5
+Version: 056+suse.268.g0b2bd662
Release: 0
Summary: Event driven initramfs infrastructure
License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.5M8o8k/_old 2022-04-14 17:24:38.107205158 +0200
+++ /var/tmp/diff_new_pack.5M8o8k/_new 2022-04-14 17:24:38.111205162 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/opensuse/dracut.git</param>
- <param
name="changesrevision">40dbd4cc01ee4caef4bb8c6f47f82ee4dcca5569</param></service></servicedata>
+ <param
name="changesrevision">0b2bd662feb718089053172c3df27623543b0088</param></service></servicedata>
(No newline at EOF)
++++++ dracut-056+suse.261.gf83268d5.obscpio ->
dracut-056+suse.268.g0b2bd662.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-056+suse.261.gf83268d5/modules.d/90lvm/module-setup.sh
new/dracut-056+suse.268.g0b2bd662/modules.d/90lvm/module-setup.sh
--- old/dracut-056+suse.261.gf83268d5/modules.d/90lvm/module-setup.sh
2022-04-05 14:21:15.000000000 +0200
+++ new/dracut-056+suse.268.g0b2bd662/modules.d/90lvm/module-setup.sh
2022-04-12 12:43:29.000000000 +0200
@@ -3,7 +3,7 @@
# called by dracut
check() {
# No point trying to support lvm if the binaries are missing
- require_binaries lvm || return 1
+ require_binaries lvm grep || return 1
[[ $hostonly ]] || [[ $mount_needs ]] && {
for fs in "${host_fs_types[@]}"; do
@@ -48,7 +48,7 @@
# called by dracut
install() {
- inst lvm
+ inst_multiple lvm grep
if [[ $hostonly_cmdline == "yes" ]]; then
local _lvmconf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-056+suse.261.gf83268d5/modules.d/95resume/module-setup.sh
new/dracut-056+suse.268.g0b2bd662/modules.d/95resume/module-setup.sh
--- old/dracut-056+suse.261.gf83268d5/modules.d/95resume/module-setup.sh
2022-04-05 14:21:15.000000000 +0200
+++ new/dracut-056+suse.268.g0b2bd662/modules.d/95resume/module-setup.sh
2022-04-12 12:43:29.000000000 +0200
@@ -5,15 +5,18 @@
swap_on_netdevice() {
local _dev
for _dev in "${swap_devs[@]}"; do
- block_is_netdevice "$_dev" && return 0
+ block_is_netdevice "$(get_maj_min "$_dev")" && return 0
done
return 1
}
- # Only support resume if no swap is mounted on a net device
+ # Only support resume if there is any suitable swap and
+ # it is not mounted on a net device
[[ $hostonly ]] || [[ $mount_needs ]] && {
+ ((${#swap_devs[@]})) || return 1
# sanity check: do not add the resume module if there is a
- # resume argument pointing to a non existent disk
+ # resume argument pointing to a non existent disk or to a
+ # volatile swap
local _resume
_resume=$(getarg resume=)
if [ -n "$_resume" ]; then
@@ -22,6 +25,16 @@
derror "Current resume kernel argument points to an invalid
disk"
return 255
fi
+ if [[ "$_resume" == /dev/mapper/* ]]; then
+ if [[ -f "$dracutsysrootdir"/etc/crypttab ]]; then
+ local _mapper _opts
+ read -r _mapper _ _ _opts < <(grep -m1 -w
"^${_resume#/dev/mapper/}" "$dracutsysrootdir"/etc/crypttab)
+ if [[ -n "$_mapper" ]] && [[ "$_opts" == *swap* ]]; then
+ derror "Current resume kernel argument points to a
volatile swap"
+ return 255
+ fi
+ fi
+ fi
fi
swap_on_netdevice && return 255
}
++++++ dracut.obsinfo ++++++
--- /var/tmp/diff_new_pack.5M8o8k/_old 2022-04-14 17:24:38.363205457 +0200
+++ /var/tmp/diff_new_pack.5M8o8k/_new 2022-04-14 17:24:38.367205462 +0200
@@ -1,6 +1,6 @@
name: dracut
-version: 056+suse.261.gf83268d5
-mtime: 1649161275
-commit: f83268d56716bc1704ad1b610f6cbc8d1d941a35
+version: 056+suse.268.g0b2bd662
+mtime: 1649760209
+commit: 0b2bd662feb718089053172c3df27623543b0088
