Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package resource-agents for openSUSE:Factory
checked in at 2021-12-12 00:56:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/resource-agents (Old)
and /work/SRC/openSUSE:Factory/.resource-agents.new.2520 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "resource-agents"
Sun Dec 12 00:56:05 2021 rev:112 rq:936227 version:4.10.0+git22.a614b31c
Changes:
--------
--- /work/SRC/openSUSE:Factory/resource-agents/resource-agents.changes
2021-11-27 00:51:37.614739391 +0100
+++
/work/SRC/openSUSE:Factory/.resource-agents.new.2520/resource-agents.changes
2021-12-12 00:56:51.154553191 +0100
@@ -1,0 +2,10 @@
+Tue Dec 07 10:18:38 UTC 2021 - vark...@suse.com
+
+- Update to version 4.10.0+git22.a614b31c:
+ * asterisk: Sipsak check fix (#1716)
+ * [rpm] fix Requires to allow install on opensuse (#1721) (jsc#SLE-21043)
+ * Filesystem: unmount bind mounts before unmount file system
+ * db2: use -l forever instead of -t nodes -l reboot, as they conflict with
eachother
+ * nginx: replace error log messages with calls to ocf_exit_reason
+
+-------------------------------------------------------------------
Old:
----
resource-agents-4.10.0+git13.7263a78d.tar.xz
New:
----
resource-agents-4.10.0+git22.a614b31c.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ resource-agents.spec ++++++
--- /var/tmp/diff_new_pack.8i0l1H/_old 2021-12-12 00:56:51.642553526 +0100
+++ /var/tmp/diff_new_pack.8i0l1H/_new 2021-12-12 00:56:51.642553526 +0100
@@ -17,7 +17,7 @@
Name: resource-agents
-Version: 4.10.0+git13.7263a78d
+Version: 4.10.0+git22.a614b31c
Release: 0
Summary: HA Reusable Cluster Resource Scripts
License: GPL-2.0-only AND LGPL-2.1-or-later AND GPL-3.0-or-later
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.8i0l1H/_old 2021-12-12 00:56:51.686553556 +0100
+++ /var/tmp/diff_new_pack.8i0l1H/_new 2021-12-12 00:56:51.686553556 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/ClusterLabs/resource-agents.git</param>
-<param name="changesrevision">7263a78d020f251055f5be12e09af96ddbe7a5ea</param>
+<param name="changesrevision">a614b31ccc9df4ac415a4c787173d8e260bc5e6c</param>
</service>
</servicedata>
\ No newline at end of file
++++++ resource-agents-4.10.0+git13.7263a78d.tar.xz ->
resource-agents-4.10.0+git22.a614b31c.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.10.0+git13.7263a78d/heartbeat/Filesystem
new/resource-agents-4.10.0+git22.a614b31c/heartbeat/Filesystem
--- old/resource-agents-4.10.0+git13.7263a78d/heartbeat/Filesystem
2021-11-19 15:31:35.000000000 +0100
+++ new/resource-agents-4.10.0+git22.a614b31c/heartbeat/Filesystem
2021-12-06 11:36:48.000000000 +0100
@@ -359,6 +359,27 @@
list_mounts | grep "${TAB}${1}/" | cut -d"$TAB" -f2 | sort -r
}
+# Lists all bind mounts of a given file system,
+# excluding the path itself.
+list_bindmounts() {
+ if is_bind_mount; then
+ # skip bind mount
+ # we should not umount the original file system via a bind mount
+ return
+ fi
+
+ match_string="${TAB}${1}${TAB}"
+ if list_mounts | grep "$match_string" >/dev/null 2>&1; then
+ mount_disk=$(list_mounts | grep "$match_string" | cut -d"$TAB"
-f1)
+ else
+ return
+ fi
+
+ if [ -b "$mount_disk" ]; then
+ list_mounts | grep "$mount_disk" | grep -v "$match_string" |
cut -d"$TAB" -f2 | sort -r
+ fi
+}
+
# kernels < 2.6.26 can't handle bind remounts
bind_kernel_check() {
echo "$options" | grep -w ro >/dev/null 2>&1 ||
@@ -696,6 +717,7 @@
fi
done <<-EOF
$(list_submounts "$CANONICALIZED_MOUNTPOINT"; \
+ list_bindmounts "$CANONICALIZED_MOUNTPOINT"; \
echo $CANONICALIZED_MOUNTPOINT)
EOF
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.10.0+git13.7263a78d/heartbeat/asterisk
new/resource-agents-4.10.0+git22.a614b31c/heartbeat/asterisk
--- old/resource-agents-4.10.0+git13.7263a78d/heartbeat/asterisk
2021-11-19 15:31:35.000000000 +0100
+++ new/resource-agents-4.10.0+git22.a614b31c/heartbeat/asterisk
2021-12-06 11:36:48.000000000 +0100
@@ -308,7 +308,7 @@
# start.
#To avoid the case where the sipsak check runs before the sip starts at
the start action
- SIPCHECK=`sipsak -s $OCF_RESKEY_monitor_sipuri`
+ SIPCHECK="sipsak -s $OCF_RESKEY_monitor_sipuri"
if [ -n "$OCF_RESKEY_monitor_sipuri" ]; then
ocf_run $SIPCHECK
rc=$?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/resource-agents-4.10.0+git13.7263a78d/heartbeat/db2
new/resource-agents-4.10.0+git22.a614b31c/heartbeat/db2
--- old/resource-agents-4.10.0+git13.7263a78d/heartbeat/db2 2021-11-19
15:31:35.000000000 +0100
+++ new/resource-agents-4.10.0+git22.a614b31c/heartbeat/db2 2021-12-06
11:36:48.000000000 +0100
@@ -274,7 +274,7 @@
while read id node member
do
[ "$member" = member -a "$node" != "$me" ] || continue
- crm_attribute -t nodes -l reboot --node=$node -n $attr -v "$3"
+ crm_attribute -l forever --node=$node -n $attr -v "$3"
rc=$?
ocf_log info "DB2 instance $instance($db2node/$db: setting attrib
for FAL to $FIRST_ACTIVE_LOG @ $node"
[ $rc != 0 ] && break
@@ -282,7 +282,7 @@
;;
get)
- crm_attribute -t nodes -l reboot -n $attr -G --quiet 2>&1
+ crm_attribute -l forever -n $attr -G --quiet 2>&1
rc=$?
if [ $rc != 0 ]
then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.10.0+git13.7263a78d/heartbeat/nginx
new/resource-agents-4.10.0+git22.a614b31c/heartbeat/nginx
--- old/resource-agents-4.10.0+git13.7263a78d/heartbeat/nginx 2021-11-19
15:31:35.000000000 +0100
+++ new/resource-agents-4.10.0+git22.a614b31c/heartbeat/nginx 2021-12-06
11:36:48.000000000 +0100
@@ -175,13 +175,13 @@
if
[ "x$test_regex" = x -o "x$test_url" = x ]
then
- ocf_log err "test regular expression or test url empty"
+ ocf_exit_reason "test regular expression or test url empty"
return 1
fi
if
[ "x$test_user$test_password" != x -a \( "x$test_user" = x -o
"x$test_password" = x \) ]
then
- ocf_log err "bad user authentication for extended test"
+ ocf_exit_reason "bad user authentication for extended test"
return 1
fi
return 0
@@ -213,7 +213,7 @@
"match") test_regex="$value" ;;
"end") break ;;
"#"*|"") ;;
- *) ocf_log err "$lcnt: $key: unknown keyword"; return 1 ;;
+ *) ocf_exit_reason "$lcnt: $key: unknown keyword"; return 1 ;;
esac
else
[ "$key" = "test" ] &&
@@ -548,7 +548,7 @@
if
[ -z "$EXTMONITOR" ]
then
- ocf_log err "$External level 30 Monitor Command not configured."
+ ocf_exit_reason "$External level 30 Monitor Command not configured."
return $OCF_ERR_CONFIGURED
fi
extbase=`echo $EXTMONITOR | sed 's% .*%%'`
@@ -560,7 +560,7 @@
then
: OK - $extbase seems to be there...
else
- ocf_log err "$External monitor command [$extbase] is not installed."
+ ocf_exit_reason "$External monitor command [$extbase] is not installed."
return $OCF_ERR_CONFIGURED
fi
if
@@ -568,7 +568,7 @@
then
: OK - $extbase succeeded
else
- ocf_log err "$extbase reported failure [rc=$?]"
+ ocf_exit_reason "$extbase reported failure [rc=$?]"
return $OCF_NOT_RUNNING
fi
return $OCF_SUCCESS
@@ -594,12 +594,12 @@
if
[ -z "$STATUSURL" ]
then
- ocf_log err "status10url parameter empty"
+ ocf_exit_reason "status10url parameter empty"
return $OCF_ERR_CONFIGURED
elif
[ -z "$ourhttpclient" ]
then
- ocf_log err "could not find a http client; make sure that either wget or
curl is available"
+ ocf_exit_reason "could not find a http client; make sure that either wget
or curl is available"
return $OCF_ERR_CONFIGURED
fi
${ourhttpclient}_func "$STATUSURL" | grep -Ei "$TESTREGEX" > /dev/null
@@ -818,7 +818,7 @@
then
: OK
else
- ocf_log err "Port number $PORT is invalid!"
+ ocf_exit_reason "Port number $PORT is invalid!"
exit $OCF_ERR_ARGS
fi
@@ -829,21 +829,21 @@
else
case $STATUSURL in
http://*/*) ;;
- *) ocf_log err "Invalid STATUSURL $STATUSURL"
+ *) ocf_exit_reason "Invalid STATUSURL $STATUSURL"
exit $OCF_ERR_ARGS ;;
esac
fi
if
[ ! -x $NGINXD ]
then
- ocf_log err "NGINXD $NGINXD not found or is not an executable!"
+ ocf_exit_reason "NGINXD $NGINXD not found or is not an executable!"
exit $OCF_ERR_ARGS
fi
if
[ ! -f $CONFIGFILE ]
then
# We are sure to succeed here, since we have parsed $CONFIGFILE before
getting here
- ocf_log err "Configuration file $CONFIGFILE not found!"
+ ocf_exit_reason "Configuration file $CONFIGFILE not found!"
exit $OCF_ERR_CONFIGURED
fi
if
@@ -851,7 +851,7 @@
then
: Cool $NGINXD likes $CONFIGFILE
else
- ocf_log err "$NGINXD $OPTIONS -t -c $CONFIGFILE reported a configuration
error."
+ ocf_exit_reason "$NGINXD $OPTIONS -t -c $CONFIGFILE reported a
configuration error."
return $OCF_ERR_CONFIGURED
fi
return $OCF_SUCCESS
@@ -901,7 +901,7 @@
status) exit $LSB_STATUS_STOPPED;;
meta-data) metadata_nginx;;
esac
- ocf_log err "nginx binary not found! Please verify you've installed it"
+ ocf_exit_reason "nginx binary not found! Please verify you've installed it"
exit $OCF_ERR_INSTALLED
fi
# Let the user know that the $NGINXD used is the one (s)he specified via
$OCF_RESKEY_httpd
@@ -940,7 +940,7 @@
then
: OK
else
- ocf_log err "Cannot parse config file [$CONFIGFILE]"
+ ocf_exit_reason "Cannot parse config file [$CONFIGFILE]"
exit $OCF_ERR_CONFIGURED
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.10.0+git13.7263a78d/resource-agents.spec.in
new/resource-agents-4.10.0+git22.a614b31c/resource-agents.spec.in
--- old/resource-agents-4.10.0+git13.7263a78d/resource-agents.spec.in
2021-11-19 15:31:35.000000000 +0100
+++ new/resource-agents-4.10.0+git22.a614b31c/resource-agents.spec.in
2021-12-06 11:36:48.000000000 +0100
@@ -91,13 +91,26 @@
# system tools shared by several agents
Requires: /bin/bash /usr/bin/grep /bin/sed /bin/gawk
Requires: /bin/ps /usr/bin/pkill /usr/bin/hostname /usr/bin/netstat
-Requires: /usr/sbin/fuser /bin/mount
+Requires: /bin/mount
+%if 0%{?suse_version}
+Requires: /usr/bin/fuser
+%else
+Requires: /usr/sbin/fuser
+%endif
# Filesystem / fs.sh / netfs.sh
+%if 0%{?suse_version}
+Requires: /usr/sbin/fsck
+%else
Requires: /sbin/fsck
+%endif
Requires: /usr/sbin/fsck.ext2 /usr/sbin/fsck.ext3 /usr/sbin/fsck.ext4
Requires: /usr/sbin/fsck.xfs
+%if 0%{?suse_version}
+Requires: /usr/sbin/mount.nfs /usr/sbin/mount.nfs4
+%else
Requires: /sbin/mount.nfs /sbin/mount.nfs4
+%endif
%if 0%{?fedora} < 33 || (0%{?rhel} && 0%{?rhel} < 9) || (0%{?centos} &&
0%{?centos} < 9) || 0%{?suse_version}
%if (0%{?rhel} && 0%{?rhel} < 8) || (0%{?centos} && 0%{?centos} < 8)
Requires: /usr/sbin/mount.cifs
@@ -113,7 +126,12 @@
Requires: /usr/sbin/lvm
# nfsserver / netfs.sh
-Requires: /usr/sbin/rpc.nfsd /sbin/rpc.statd /usr/sbin/rpc.mountd
+%if 0%{?suse_version}
+Requires: /usr/sbin/rpc.statd
+%else
+Requires: /sbin/rpc.statd
+%endif
+Requires: /usr/sbin/rpc.nfsd /usr/sbin/rpc.mountd
# ocf-distro
Requires: /usr/bin/lsb_release
