Hello community,
here is the log from the commit of package systemd for openSUSE:Factory checked
in at 2018-08-17 23:56:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd (Old)
and /work/SRC/openSUSE:Factory/.systemd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd"
Fri Aug 17 23:56:48 2018 rev:284 rq:628336 version:237
Changes:
--------
--- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2018-08-02
14:50:30.699514107 +0200
+++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes
2018-08-17 23:56:50.657777889 +0200
@@ -1,0 +2,16 @@
+Wed Aug 8 13:26:03 UTC 2018 - f...@suse.com
+
+- Import commit bb5a925bcefd4743873cae3f748ae1a426e92d44
+
+ 8983bd246 core: don't include libmount.h in a header file (#8580)
+ 3e4156a8f tmpfiles: don't adjust qgroups on existing subvolumes (bsc#1093753)
+ 42edc93ac core/service: rework the hold-off time over message
+
+-------------------------------------------------------------------
+Wed Aug 1 12:19:40 UTC 2018 - f...@suse.com
+
+- Enable regexp matching support
+
+ Currently only used by "journalctl --grep=xxx".
+
+-------------------------------------------------------------------
systemd.changes: same change
Old:
----
systemd-v237+suse.71.g0350f62a8.tar.xz
New:
----
systemd-v237+suse.76.gbb5a925bc.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ systemd-mini.spec ++++++
--- /var/tmp/diff_new_pack.h7eNmW/_old 2018-08-17 23:56:51.489780359 +0200
+++ /var/tmp/diff_new_pack.h7eNmW/_new 2018-08-17 23:56:51.493780371 +0200
@@ -26,7 +26,7 @@
##### WARNING: please do not edit this auto generated spec file. Use the
systemd.spec! #####
%define mini -mini
%define min_kernel_version 4.5
-%define suse_version +suse.71.g0350f62a8
+%define suse_version +suse.76.gbb5a925bc
%bcond_with gnuefi
%if 0%{?bootstrap}
@@ -70,6 +70,7 @@
BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0
BuildRequires: pkgconfig(liblz4)
BuildRequires: pkgconfig(liblzma)
+BuildRequires: pkgconfig(libpcre2-8)
BuildRequires: pkgconfig(libqrencode)
BuildRequires: pkgconfig(libselinux) >= 2.1.9
%ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x
++++++ systemd.spec ++++++
--- /var/tmp/diff_new_pack.h7eNmW/_old 2018-08-17 23:56:51.513780430 +0200
+++ /var/tmp/diff_new_pack.h7eNmW/_new 2018-08-17 23:56:51.517780442 +0200
@@ -24,7 +24,7 @@
%define bootstrap 0
%define mini %nil
%define min_kernel_version 4.5
-%define suse_version +suse.71.g0350f62a8
+%define suse_version +suse.76.gbb5a925bc
%bcond_with gnuefi
%if 0%{?bootstrap}
@@ -68,6 +68,7 @@
BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0
BuildRequires: pkgconfig(liblz4)
BuildRequires: pkgconfig(liblzma)
+BuildRequires: pkgconfig(libpcre2-8)
BuildRequires: pkgconfig(libqrencode)
BuildRequires: pkgconfig(libselinux) >= 2.1.9
%ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x
++++++ systemd-v237+suse.71.g0350f62a8.tar.xz ->
systemd-v237+suse.76.gbb5a925bc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/systemd-v237+suse.71.g0350f62a8/man/tmpfiles.d.xml
new/systemd-v237+suse.76.gbb5a925bc/man/tmpfiles.d.xml
--- old/systemd-v237+suse.71.g0350f62a8/man/tmpfiles.d.xml 2018-07-27
12:20:39.000000000 +0200
+++ new/systemd-v237+suse.76.gbb5a925bc/man/tmpfiles.d.xml 2018-08-08
15:22:34.000000000 +0200
@@ -209,68 +209,47 @@
<varlistentry>
<term><varname>q</varname></term>
- <listitem><para>Similar to <varname>v</varname>. However,
- makes sure that the subvolume will be assigned to the same
- higher-level quota groups as the subvolume it has been
- created in. This ensures that higher-level limits and
- accounting applied to the parent subvolume also include the
- specified subvolume. On non-btrfs file systems, this line
- type is identical to <varname>d</varname>. If the subvolume
- already exists and is already assigned to one or more higher
- level quota groups, no change to the quota hierarchy is
- made. Also see <varname>Q</varname> below. See <citerefentry
-
project='die-net'><refentrytitle>btrfs-qgroup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
- for details about the btrfs quota group
- concept.</para></listitem>
+ <listitem><para>Similar to <varname>v</varname>. However, makes sure
that the subvolume will be assigned to
+ the same higher-level quota groups as the subvolume it has been
created in. This ensures that higher-level
+ limits and accounting applied to the parent subvolume also include
the specified subvolume. On non-btrfs file
+ systems, this line type is identical to <varname>d</varname>.</para>
+
+ <para>If the subvolume already exists, no change to the quota
hierarchy is made, regardless of whether the
+ subvolume is already attached to a quota group or not. Also see
<varname>Q</varname> below. See <citerefentry
+
project='die-net'><refentrytitle>btrfs-qgroup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
for
+ details about the btrfs quota group concept.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>Q</varname></term>
- <listitem><para>Similar to <varname>q</varname>. However,
- instead of copying the higher-level quota group assignments
- from the parent as-is, the lowest quota group of the parent
- subvolume is determined that is not the leaf quota
- group. Then, an "intermediary" quota group is inserted that
- is one level below this level, and shares the same ID part
- as the specified subvolume. If no higher-level quota group
- exists for the parent subvolume, a new quota group at level
- 255 sharing the same ID as the specified subvolume is
- inserted instead. This new intermediary quota group is then
- assigned to the parent subvolume's higher-level quota
- groups, and the specified subvolume's leaf quota group is
- assigned to it.</para>
-
- <para>Effectively, this has a similar effect as
- <varname>q</varname>, however introduces a new higher-level
- quota group for the specified subvolume that may be used to
- enforce limits and accounting to the specified subvolume and
- children subvolume created within it. Thus, by creating
- subvolumes only via <varname>q</varname> and
- <varname>Q</varname>, a concept of "subtree quotas" is
- implemented. Each subvolume for which <varname>Q</varname>
- is set will get a "subtree" quota group created, and all
- child subvolumes created within it will be assigned to
- it. Each subvolume for which <varname>q</varname> is set
- will not get such a "subtree" quota group, but it is ensured
- that they are added to the same "subtree" quota group as their
- immediate parents.</para>
-
- <para>It is recommended to use
- <varname>Q</varname> for subvolumes that typically contain
- further subvolumes, and where it is desirable to have
- accounting and quota limits on all child subvolumes
- together. Examples for <varname>Q</varname> are typically
- <filename>/home</filename> or
- <filename>/var/lib/machines</filename>. In contrast,
- <varname>q</varname> should be used for subvolumes that
- either usually do not include further subvolumes or where no
- accounting and quota limits are needed that apply to all
- child subvolumes together. Examples for <varname>q</varname>
- are typically <filename>/var</filename> or
- <filename>/var/tmp</filename>. As with <varname>Q</varname>,
- <varname>q</varname> has no effect on the quota group
- hierarchy if the subvolume exists and already has at least
- one higher-level quota group assigned.</para></listitem>
+ <listitem><para>Similar to <varname>q</varname>. However, instead of
copying the higher-level quota group
+ assignments from the parent as-is, the lowest quota group of the
parent subvolume is determined that is not
+ the leaf quota group. Then, an "intermediary" quota group is
inserted that is one level below this level, and
+ shares the same ID part as the specified subvolume. If no
higher-level quota group exists for the parent
+ subvolume, a new quota group at level 255 sharing the same ID as the
specified subvolume is inserted
+ instead. This new intermediary quota group is then assigned to the
parent subvolume's higher-level quota
+ groups, and the specified subvolume's leaf quota group is assigned
to it.</para>
+
+ <para>Effectively, this has a similar effect as
<varname>q</varname>, however introduces a new higher-level
+ quota group for the specified subvolume that may be used to enforce
limits and accounting to the specified
+ subvolume and children subvolume created within it. Thus, by
creating subvolumes only via
+ <varname>q</varname> and <varname>Q</varname>, a concept of "subtree
quotas" is implemented. Each subvolume
+ for which <varname>Q</varname> is set will get a "subtree" quota
group created, and all child subvolumes
+ created within it will be assigned to it. Each subvolume for which
<varname>q</varname> is set will not get
+ such a "subtree" quota group, but it is ensured that they are added
to the same "subtree" quota group as
+ their immediate parents.</para>
+
+ <para>It is recommended to use <varname>Q</varname> for subvolumes
that typically contain further subvolumes,
+ and where it is desirable to have accounting and quota limits on all
child subvolumes together. Examples for
+ <varname>Q</varname> are typically <filename>/home</filename> or
<filename>/var/lib/machines</filename>. In
+ contrast, <varname>q</varname> should be used for subvolumes that
either usually do not include further
+ subvolumes or where no accounting and quota limits are needed that
apply to all child subvolumes
+ together. Examples for <varname>q</varname> are typically
<filename>/var</filename> or
+ <filename>/var/tmp</filename>. </para>
+
+ <para>As with <varname>q</varname>, <varname>Q</varname> has no
effect on the quota group hierarchy if the
+ subvolume already exists, regardless of whether the subvolume
already belong to a quota group or
+ not.</para></listitem>
</varlistentry>
<varlistentry>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/systemd-v237+suse.71.g0350f62a8/src/core/dbus-execute.c
new/systemd-v237+suse.76.gbb5a925bc/src/core/dbus-execute.c
--- old/systemd-v237+suse.71.g0350f62a8/src/core/dbus-execute.c 2018-07-27
12:20:39.000000000 +0200
+++ new/systemd-v237+suse.76.gbb5a925bc/src/core/dbus-execute.c 2018-08-08
15:22:34.000000000 +0200
@@ -18,6 +18,7 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include <sys/mount.h>
#include <sys/prctl.h>
#include <stdio_ext.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/systemd-v237+suse.71.g0350f62a8/src/core/manager.h
new/systemd-v237+suse.76.gbb5a925bc/src/core/manager.h
--- old/systemd-v237+suse.71.g0350f62a8/src/core/manager.h 2018-07-27
12:20:39.000000000 +0200
+++ new/systemd-v237+suse.76.gbb5a925bc/src/core/manager.h 2018-08-08
15:22:34.000000000 +0200
@@ -20,7 +20,6 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <libmount.h>
#include <stdbool.h>
#include <stdio.h>
@@ -34,6 +33,8 @@
#include "list.h"
#include "ratelimit.h"
+struct libmnt_monitor;
+
/* Enforce upper limit how many names we allow */
#define MANAGER_MAX_NAMES 131072 /* 128K */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/systemd-v237+suse.71.g0350f62a8/src/core/mount.c
new/systemd-v237+suse.76.gbb5a925bc/src/core/mount.c
--- old/systemd-v237+suse.71.g0350f62a8/src/core/mount.c 2018-07-27
12:20:39.000000000 +0200
+++ new/systemd-v237+suse.76.gbb5a925bc/src/core/mount.c 2018-08-08
15:22:34.000000000 +0200
@@ -23,6 +23,8 @@
#include <stdio.h>
#include <sys/epoll.h>
+#include <libmount.h>
+
#include "sd-messages.h"
#include "alloc-util.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/systemd-v237+suse.71.g0350f62a8/src/core/service.c
new/systemd-v237+suse.76.gbb5a925bc/src/core/service.c
--- old/systemd-v237+suse.71.g0350f62a8/src/core/service.c 2018-07-27
12:20:39.000000000 +0200
+++ new/systemd-v237+suse.76.gbb5a925bc/src/core/service.c 2018-08-08
15:22:34.000000000 +0200
@@ -3377,10 +3377,15 @@
break;
case SERVICE_AUTO_RESTART:
- log_unit_info(UNIT(s),
- s->restart_usec > 0 ?
- "Service hold-off time over, scheduling
restart." :
- "Service has no hold-off time, scheduling
restart.");
+ if (s->restart_usec > 0) {
+ char buf_restart[FORMAT_TIMESPAN_MAX];
+ log_unit_info(UNIT(s),
+ "Service RestartSec=%s expired,
scheduling restart.",
+ format_timespan(buf_restart, sizeof
buf_restart, s->restart_usec, USEC_PER_SEC));
+ } else
+ log_unit_info(UNIT(s),
+ "Service has no hold-off time
(RestartSec=0), scheduling restart.");
+
service_enter_restart(s);
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/systemd-v237+suse.71.g0350f62a8/src/tmpfiles/tmpfiles.c
new/systemd-v237+suse.76.gbb5a925bc/src/tmpfiles/tmpfiles.c
--- old/systemd-v237+suse.71.g0350f62a8/src/tmpfiles/tmpfiles.c 2018-07-27
12:20:39.000000000 +0200
+++ new/systemd-v237+suse.76.gbb5a925bc/src/tmpfiles/tmpfiles.c 2018-08-08
15:22:34.000000000 +0200
@@ -1490,7 +1490,8 @@
log_debug("%s directory \"%s\".",
creation_mode_verb_to_string(creation), i->path);
- if (IN_SET(i->type, CREATE_SUBVOLUME_NEW_QUOTA,
CREATE_SUBVOLUME_INHERIT_QUOTA)) {
+ if (creation == CREATION_NORMAL &&
+ IN_SET(i->type, CREATE_SUBVOLUME_NEW_QUOTA,
CREATE_SUBVOLUME_INHERIT_QUOTA)) {
r = btrfs_subvol_auto_qgroup(i->path, 0, i->type ==
CREATE_SUBVOLUME_NEW_QUOTA);
if (r == -ENOTTY)
log_debug_errno(r, "Couldn't adjust quota for
subvolume \"%s\" (unsupported fs or dir not a subvolume): %m", i->path);
