Hello community,
here is the log from the commit of package systemd for openSUSE:Factory checked
in at 2017-04-24 09:47:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd (Old)
and /work/SRC/openSUSE:Factory/.systemd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd"
Mon Apr 24 09:47:19 2017 rev:253 rq:487063 version:232
Changes:
--------
--- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2017-03-17
14:59:34.940813003 +0100
+++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes
2017-04-24 09:47:21.068115003 +0200
@@ -1,0 +2,17 @@
+Mon Apr 10 09:38:45 UTC 2017 - f...@suse.com
+
+- Import commit f0325620d23a247682c629d28883a364e4a7a8c4
+
+ 327814841 core: when a unit's SourcePath points to API VFS pretend we are
never out-of-date (#5487)
+ f4b9fb58e units: move Before deps for quota services to remote-fs.target
(#5627) (bsc#1028263)
+ 44b9d27f8 udev: net_id - support predictable ifnames on vio buses (#5675)
(bnc#1029183)
+ 64f4761c9 units: apply plymouth warning fix to in rescue mode as well (#5615)
+ 77607b887 units: do not throw a warning in emergency mode if plymouth is not
installed (#5528) (bsc#1025398)
+ 336d6016c core: downgrade "Time has been changed" to debug (#4906)
(bsc#1028610)
+
+-------------------------------------------------------------------
+Wed Mar 22 13:24:57 UTC 2017 - f...@suse.com
+
+- Consider chroot updates in fix-machines-subvol-for-rollbacks.sh (bsc#1030290)
+
+-------------------------------------------------------------------
systemd.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
systemd.spec: same change
++++++ fix-machines-subvol-for-rollbacks.sh ++++++
--- /var/tmp/diff_new_pack.JJ1ivZ/_old 2017-04-24 09:47:22.219952091 +0200
+++ /var/tmp/diff_new_pack.JJ1ivZ/_new 2017-04-24 09:47:22.223951525 +0200
@@ -57,9 +57,26 @@
}
#
-# If something is already mounted don't try to fix anything, the
-# subvolume has already been created by either mksubvolume(8) or by
-# the admin. In the later case we don't want to screw up his setup.
+# If there's already an entry in fstab for /var/lib/machines, it
+# means that:
+#
+# - the installer initialized /var/lib/machines correctly (default)
+# - we already fixed it
+# - the sysadmin added it manually
+#
+# In any cases we should exit.
+#
+# Note: we can't simply check if /var/lib/machines has been mounted
+# because an update through a chroot might be in progress (see
+# bsc#1030290).
+#
+if mount --fake /var/lib/machines 2>/dev/null; then
+ exit
+fi
+
+#
+# If something is already mounted don't try to fix anything, it's been
+# done manually by the sysadmin.
#
if mountpoint -q /var/lib/machines; then
exit
++++++ systemd-232.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/systemd-232/src/core/manager.c
new/systemd-232/src/core/manager.c
--- old/systemd-232/src/core/manager.c 2017-03-07 10:19:41.000000000 +0100
+++ new/systemd-232/src/core/manager.c 2017-04-10 12:06:11.000000000 +0200
@@ -2151,7 +2151,7 @@
assert(m);
assert(m->time_change_fd == fd);
- log_struct(LOG_INFO,
+ log_struct(LOG_DEBUG,
LOG_MESSAGE_ID(SD_MESSAGE_TIME_CHANGE),
LOG_MESSAGE("Time has been changed"),
NULL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/systemd-232/src/core/unit.c
new/systemd-232/src/core/unit.c
--- old/systemd-232/src/core/unit.c 2017-03-07 10:19:41.000000000 +0100
+++ new/systemd-232/src/core/unit.c 2017-04-10 12:06:11.000000000 +0200
@@ -3110,6 +3110,11 @@
if (!path)
return false;
+ /* If the source is some virtual kernel file system, then we assume we
watch it anyway, and hence pretend we
+ * are never out-of-date. */
+ if (path_startswith(path, "/proc") || path_startswith(path, "/sys"))
+ return false;
+
if (stat(path, &st) < 0)
/* What, cannot access this anymore? */
return true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/systemd-232/src/udev/udev-builtin-net_id.c
new/systemd-232/src/udev/udev-builtin-net_id.c
--- old/systemd-232/src/udev/udev-builtin-net_id.c 2017-03-07
10:19:41.000000000 +0100
+++ new/systemd-232/src/udev/udev-builtin-net_id.c 2017-04-10
12:06:11.000000000 +0200
@@ -44,6 +44,7 @@
* — PCI geographical location
*
[P<domain>]p<bus>s<slot>[f<function>][u<port>][..][c<config>][i<interface>]
* — USB port number chain
+ * v<slot> - VIO slot number (IBM PowerVM)
*
* All multi-function PCI devices will carry the [f<function>] number in the
* device name, including the function 0 device.
@@ -115,6 +116,7 @@
NET_BCMA,
NET_VIRTIO,
NET_CCWGROUP,
+ NET_VIO,
};
struct netnames {
@@ -132,6 +134,7 @@
char usb_ports[IFNAMSIZ];
char bcma_core[IFNAMSIZ];
char ccw_group[IFNAMSIZ];
+ char vio_slot[IFNAMSIZ];
};
/* retrieve on-board index number and label from firmware */
@@ -300,6 +303,33 @@
return err;
}
+static int names_vio(struct udev_device *dev, struct netnames *names) {
+ struct udev_device *parent;
+ unsigned busid, slotid, ethid;
+ const char *syspath;
+
+ /* check if our direct parent is a VIO device with no other bus
in-between */
+ parent = udev_device_get_parent(dev);
+ if (!parent)
+ return -ENOENT;
+
+ if (!streq_ptr("vio", udev_device_get_subsystem(parent)))
+ return -ENOENT;
+
+ /* The devices' $DEVPATH number is tied to (virtual) hardware (slot id
+ * selected in the HMC), thus this provides a reliable naming (e.g.
+ * "/devices/vio/30000002/net/eth1"); we ignore the bus number, as
+ * there should only ever be one bus, and then remove leading zeros. */
+ syspath = udev_device_get_syspath(dev);
+
+ if (sscanf(syspath, "/sys/devices/vio/%4x%4x/net/eth%u", &busid,
&slotid, ðid) != 3)
+ return -EINVAL;
+
+ xsprintf(names->vio_slot, "v%u", slotid);
+ names->type = NET_VIO;
+ return 0;
+}
+
static int names_pci(struct udev_device *dev, struct netnames *names) {
struct udev_device *parent;
@@ -571,6 +601,16 @@
goto out;
}
+ /* get ibmveth/ibmvnic slot-based names. */
+ err = names_vio(dev, &names);
+ if (err >= 0 && names.type == NET_VIO) {
+ char str[IFNAMSIZ];
+
+ if (snprintf(str, sizeof(str), "%s%s", prefix, names.vio_slot)
< (int)sizeof(str))
+ udev_builtin_add_property(dev, test,
"ID_NET_NAME_SLOT", str);
+ goto out;
+ }
+
/* get PCI based path names, we compose only PCI based paths */
err = names_pci(dev, &names);
if (err < 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/systemd-232/units/emergency.service.in
new/systemd-232/units/emergency.service.in
--- old/systemd-232/units/emergency.service.in 2017-03-07 10:19:41.000000000
+0100
+++ new/systemd-232/units/emergency.service.in 2017-04-10 12:06:11.000000000
+0200
@@ -17,7 +17,7 @@
[Service]
Environment=HOME=/root
WorkingDirectory=-/root
-ExecStartPre=-/usr/bin/plymouth --wait quit
+ExecStartPre=-/bin/sh -c "[ -x /usr/bin/plymouth ] && /usr/bin/plymouth --wait
quit"
ExecStartPre=-/bin/echo -e 'You are in emergency mode. After logging in, type
"journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot,
"systemctl default" or ^D to\\ntry again to boot into default mode.'
ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block
default"
Type=idle
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/systemd-232/units/quotaon.service.in
new/systemd-232/units/quotaon.service.in
--- old/systemd-232/units/quotaon.service.in 2017-03-07 10:19:41.000000000
+0100
+++ new/systemd-232/units/quotaon.service.in 2017-04-10 12:06:11.000000000
+0200
@@ -10,7 +10,7 @@
Documentation=man:quotaon(8)
DefaultDependencies=no
After=systemd-quotacheck.service
-Before=local-fs.target shutdown.target
+Before=remote-fs.target shutdown.target
ConditionPathExists=@QUOTAON@
[Service]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/systemd-232/units/rescue.service.in
new/systemd-232/units/rescue.service.in
--- old/systemd-232/units/rescue.service.in 2017-03-07 10:19:41.000000000
+0100
+++ new/systemd-232/units/rescue.service.in 2017-04-10 12:06:11.000000000
+0200
@@ -16,7 +16,7 @@
[Service]
Environment=HOME=/root
WorkingDirectory=-/root
-ExecStartPre=-/usr/bin/plymouth --wait quit
+ExecStartPre=-/bin/sh -c "[ -x /usr/bin/plymouth ] && /usr/bin/plymouth --wait
quit"
ExecStartPre=-/bin/echo -e 'You are in rescue mode. After logging in, type
"journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot,
"systemctl default" or ^D to\\nboot into default mode.'
ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block
default"
Type=idle
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/systemd-232/units/systemd-quotacheck.service.in
new/systemd-232/units/systemd-quotacheck.service.in
--- old/systemd-232/units/systemd-quotacheck.service.in 2017-03-07
10:19:41.000000000 +0100
+++ new/systemd-232/units/systemd-quotacheck.service.in 2017-04-10
12:06:11.000000000 +0200
@@ -10,7 +10,7 @@
Documentation=man:systemd-quotacheck.service(8)
DefaultDependencies=no
After=systemd-remount-fs.service
-Before=local-fs.target shutdown.target
+Before=remote-fs.target shutdown.target
ConditionPathExists=@QUOTACHECK@
[Service]
