summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am19
-rw-r--r--hwdb/70-mouse.hwdb28
-rw-r--r--man/busctl.xml1
-rw-r--r--man/custom-html.xsl2
-rw-r--r--man/systemd-bus-proxyd.service.xml3
-rw-r--r--man/systemd-bus-proxyd.xml3
-rw-r--r--man/systemd.service.xml3
-rw-r--r--src/libsystemd/libsystemd.sym7
-rw-r--r--src/libsystemd/sd-bus/bus-objects.c4
-rw-r--r--src/udev/udevd.c8
10 files changed, 44 insertions, 34 deletions
diff --git a/Makefile.am b/Makefile.am
index 936e4edd81..13cc7825de 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -734,8 +734,7 @@ EXTRA_DIST += \
tools/xml_helper.py \
man/systemd.index.xml \
man/index.html \
- man/glib-event-glue.c \
- $(NULL)
+ man/glib-event-glue.c
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
@@ -3683,18 +3682,15 @@ EXTRA_DIST += \
# ------------------------------------------------------------------------------
TESTS += \
- test/udev-test.pl \
- $(NULL)
+ test/udev-test.pl
if HAVE_PYTHON
TESTS += \
- test/rule-syntax-check.py \
- $(NULL)
+ test/rule-syntax-check.py
if HAVE_SYSV_COMPAT
TESTS += \
- test/sysv-generator-test.py \
- $(NULL)
+ test/sysv-generator-test.py
endif
endif
@@ -3733,8 +3729,7 @@ EXTRA_DIST += \
test/udev-test.pl \
test/rule-syntax-check.py \
test/sysv-generator-test.py \
- test/mocks/fsck \
- $(NULL)
+ test/mocks/fsck
# ------------------------------------------------------------------------------
@@ -6282,6 +6277,10 @@ hwdb-update:
git-tag:
git tag -s "v$(VERSION)" -m "systemd $(VERSION)"
+.PHONY: git-tar
+git-tar:
+ git archive --format=tar --prefix=systemd-$(VERSION)/ HEAD | xz > systemd-$(VERSION).tar.xz
+
www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
.PHONY: upload
upload: all check dist
diff --git a/hwdb/70-mouse.hwdb b/hwdb/70-mouse.hwdb
index 6c77b74e53..1633321502 100644
--- a/hwdb/70-mouse.hwdb
+++ b/hwdb/70-mouse.hwdb
@@ -177,6 +177,10 @@ mouse:usb:v046dpc401:name:Logitech USB-PS/2 Trackball:
mouse:usb:v04b3p310c:name:USB Optical Mouse:
MOUSE_DPI=400@142
+# Logitech M570 trackball
+mouse:usb:v046dp1028:name:Logitech M570:
+ MOUSE_DPI=540@167
+
# Logitech USB-PS/2 M-BZ96C
mouse:usb:v046dpc045:name:Logitech USB-PS/2 Optical Mouse:
MOUSE_DPI=600@125
@@ -203,18 +207,6 @@ mouse:usb:v046dpc01e:name:Logitech USB-PS/2 Optical Mouse:
mouse:usb:v046dpc050:name:Logitech USB-PS/2 Optical Mouse:
MOUSE_DPI=800@142
-# Logitech G400 (Wired)
-mouse:usb:v046dpc245:name:Logitech Gaming Mouse G400:
- MOUSE_DPI=400@1000 *800@1000 1800@1000 3600@1000
-
-# Logitech G400s (Wired)
-mouse:usb:v046dpc24c:name:Logitech G400s Optical Gaming Mouse:
- MOUSE_DPI=400@1000 *800@1000 2000@1000 4000@1000
-
-# Logitech M570 trackball
-mouse:usb:v046dp1028:name:Logitech M570:
- MOUSE_DPI=540@167
-
# Logitech Wireless Mouse M185
mouse:usb:v046dp4008:name:Logitech M185:
mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:4008:
@@ -223,12 +215,24 @@ mouse:usb:v046dp101b:name:Logitech M705:
mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:101b:
MOUSE_DPI=800@166
+# Logitech MX Revolution
+mouse:usb:v046dpc51a:name:Logitech USB Receiver:
+ MOUSE_DPI=800@200
+
# Logitech G5 Laser Mouse
mouse:usb:v046dpc049:name:Logitech USB Gaming Mouse:
# Logitech G500s Laser Gaming Mouse
mouse:usb:v046dpc24e:name:Logitech G500s Laser Gaming Mouse:
MOUSE_DPI=400@500 *800@500 2000@500
+# Logitech G400 (Wired)
+mouse:usb:v046dpc245:name:Logitech Gaming Mouse G400:
+ MOUSE_DPI=400@1000 *800@1000 1800@1000 3600@1000
+
+# Logitech G400s (Wired)
+mouse:usb:v046dpc24c:name:Logitech G400s Optical Gaming Mouse:
+ MOUSE_DPI=400@1000 *800@1000 2000@1000 4000@1000
+
# Logitech B605 Wireless Mouse (also M505)
mouse:usb:v046dp101d:name:Logitech B605:
mouse:usb:v046dp101d:name:Logitech M505:
diff --git a/man/busctl.xml b/man/busctl.xml
index 233afa955c..4f0b2a7051 100644
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -471,7 +471,6 @@ o "/org/freedesktop/systemd1/job/42684"</programlisting>
<para>
<citerefentry project='dbus'><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<ulink url="http://freedesktop.org/wiki/Software/dbus">D-Bus</ulink>,
- <ulink url="https://code.google.com/p/d-bus/">kdbus</ulink>,
<citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-bus-proxyd</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
diff --git a/man/custom-html.xsl b/man/custom-html.xsl
index 0856c1f29c..b298c216b1 100644
--- a/man/custom-html.xsl
+++ b/man/custom-html.xsl
@@ -231,7 +231,7 @@
<xsl:text>../python-systemd/index.html</xsl:text>
</xsl:attribute>
<xsl:text>Python </xsl:text>
- </a>ยท
+ </a>
<span style="float:right">
<xsl:text>systemd </xsl:text>
diff --git a/man/systemd-bus-proxyd.service.xml b/man/systemd-bus-proxyd.service.xml
index 5c0f3e1a7a..02189eea7c 100644
--- a/man/systemd-bus-proxyd.service.xml
+++ b/man/systemd-bus-proxyd.service.xml
@@ -74,8 +74,7 @@
<para>
<citerefentry><refentrytitle>systemd-bus-proxyd</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry project='dbus'><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
- <ulink url="http://freedesktop.org/wiki/Software/dbus">D-Bus</ulink>,
- <ulink url="https://code.google.com/p/d-bus/">kdbus</ulink>
+ <ulink url="http://freedesktop.org/wiki/Software/dbus">D-Bus</ulink>
</para>
</refsect1>
</refentry>
diff --git a/man/systemd-bus-proxyd.xml b/man/systemd-bus-proxyd.xml
index 63652b185b..0923396151 100644
--- a/man/systemd-bus-proxyd.xml
+++ b/man/systemd-bus-proxyd.xml
@@ -102,8 +102,7 @@
<para>
<citerefentry project='dbus'><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
- <ulink url="http://freedesktop.org/wiki/Software/dbus">D-Bus</ulink>,
- <ulink url="https://code.google.com/p/d-bus/">kdbus</ulink>
+ <ulink url="http://freedesktop.org/wiki/Software/dbus">D-Bus</ulink>
</para>
</refsect1>
</refentry>
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 191adcda52..1e949f0c52 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -243,8 +243,7 @@
<varlistentry>
<term><varname>BusPolicy=</varname></term>
- <listitem><para>If specified, a custom
- <ulink url="https://code.google.com/p/d-bus/">kdbus</ulink>
+ <listitem><para>If specified, a custom kdbus
endpoint will be created and installed as the default bus node
for the service. Such a custom endpoint can hold an own set of
policy rules that are enforced on top of the bus-wide ones.
diff --git a/src/libsystemd/libsystemd.sym b/src/libsystemd/libsystemd.sym
index 809db1f6cc..97005dbac3 100644
--- a/src/libsystemd/libsystemd.sym
+++ b/src/libsystemd/libsystemd.sym
@@ -459,3 +459,10 @@ global:
sd_event_source_get_signal;
sd_event_source_get_child_pid;
} LIBSYSTEMD_220;
+
+LIBSYSTEMD_222 {
+global:
+ /* sd-bus */
+ sd_bus_emit_object_added;
+ sd_bus_emit_object_removed;
+} LIBSYSTEMD_221;
diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
index e4bbd880e5..2eaa7de306 100644
--- a/src/libsystemd/sd-bus/bus-objects.c
+++ b/src/libsystemd/sd-bus/bus-objects.c
@@ -2261,7 +2261,7 @@ static int object_added_append_all(sd_bus *bus, sd_bus_message *m, const char *p
return 0;
}
-int sd_bus_emit_object_added(sd_bus *bus, const char *path) {
+_public_ int sd_bus_emit_object_added(sd_bus *bus, const char *path) {
BUS_DONT_DESTROY(bus);
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
@@ -2424,7 +2424,7 @@ static int object_removed_append_all(sd_bus *bus, sd_bus_message *m, const char
return 0;
}
-int sd_bus_emit_object_removed(sd_bus *bus, const char *path) {
+_public_ int sd_bus_emit_object_removed(sd_bus *bus, const char *path) {
BUS_DONT_DESTROY(bus);
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index c205f1d5ec..ff15664cb4 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1672,8 +1672,12 @@ int main(int argc, char *argv[]) {
we only do this on systemd systems, and only if we are directly spawned
by PID1. otherwise we are not guaranteed to have a dedicated cgroup */
r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, 0, &cgroup);
- if (r < 0)
- log_warning_errno(r, "failed to get cgroup: %m");
+ if (r < 0) {
+ if (r == -ENOENT)
+ log_debug_errno(r, "did not find dedicated cgroup: %m");
+ else
+ log_warning_errno(r, "failed to get cgroup: %m");
+ }
}
r = listen_fds(&fd_ctrl, &fd_uevent);
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-12-26 21:29:23 +0000