Commit f13b388f authored by Kay Sievers's avatar Kay Sievers
Browse files

udev: install udevd as /usr/lib/systemd/systemd-udevd

parent 33502ffe
......@@ -112,7 +112,7 @@ stamp-*
/mtd_probe
/scsi_id
/udevadm
/udevd
/systemd-udevd
/v4l_id
/test-libudev
/test-udev
......@@ -101,6 +101,7 @@ check_PROGRAMS =
check_DATA =
noinst_PROGRAMS =
TESTS =
udevlibexec_PROGRAMS =
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
......@@ -296,8 +297,8 @@ dist_systemunit_DATA = \
units/systemd-ask-password-wall.path \
units/systemd-ask-password-console.path \
units/syslog.target \
units/udev-control.socket \
units/udev-kernel.socket
units/systemd-udev-control.socket \
units/systemd-udev-kernel.socket
nodist_systemunit_DATA = \
units/getty@.service \
......@@ -323,9 +324,9 @@ nodist_systemunit_DATA = \
units/fsck-root.service \
units/rescue.service \
units/user@.service \
units/udev.service \
units/udev-trigger.service \
units/udev-settle.service
units/systemd-udev.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service
dist_userunit_DATA = \
units/user/default.target \
......@@ -359,9 +360,9 @@ EXTRA_DIST += \
units/fsck@.service.in \
units/fsck-root.service.in \
units/user@.service.in \
units/udev.service \
units/udev-trigger.service \
units/udev-settle.service \
units/systemd-udev.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
introspect.awk \
man/custom-html.xsl
......@@ -1358,7 +1359,7 @@ libudev_private_la_LIBADD = \
MANPAGES += \
man/udev.7 \
man/udevadm.8 \
man/udevd.8
man/systemd-udevd.8
udev-confdirs:
-mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
......@@ -1398,30 +1399,30 @@ CLEANFILES += \
src/udev/udev.pc
EXTRA_DIST += \
units/udev.service.in \
units/udev-trigger.service.in \
units/udev-settle.service.in
units/systemd-udev.service.in \
units/systemd-udev-trigger.service.in \
units/systemd-udev-settle.service.in
CLEANFILES += \
units/udev.service \
units/udev-trigger.service \
units/udev-settle.service
units/systemd-udev.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service
systemd-install-hook:
mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants
ln -sf ../udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/udev-control.socket
ln -sf ../udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/udev-kernel.socket
ln -sf ../systemd-udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-control.socket
ln -sf ../systemd-udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-kernel.socket
mkdir -p $(DESTDIR)$(systemunitdir)/basic.target.wants
ln -sf ../udev.service $(DESTDIR)$(systemunitdir)/basic.target.wants/udev.service
ln -sf ../udev-trigger.service $(DESTDIR)$(systemunitdir)/basic.target.wants/udev-trigger.service
ln -sf ../systemd-udev.service $(DESTDIR)$(systemunitdir)/basic.target.wants/systemd-udev.service
ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/basic.target.wants/systemd-udev-trigger.service
INSTALL_DATA_HOOKS += systemd-install-hook
bin_PROGRAMS += \
udevadm
udevlibexec_PROGRAMS = \
udevd
rootlibexec_PROGRAMS += \
systemd-udevd
noinst_LTLIBRARIES += \
libudev-core.la
......@@ -1469,10 +1470,10 @@ libudev_core_la_LIBADD += \
libsystemd-acl.la
endif
udevd_SOURCES = \
systemd_udevd_SOURCES = \
src/udev/udevd.c
udevd_LDADD = \
systemd_udevd_LDADD = \
libudev-core.la
udevadm_SOURCES = \
......@@ -3227,6 +3228,9 @@ install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)
distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
clean-local:
rm -rf $(abs_srcdir)/install-tree
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
--with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
......@@ -3249,3 +3253,8 @@ doc-sync: all
git-tag:
git tag "v$(VERSION)" -m "systemd $(VERSION)"
install-tree: all
rm -rf $(abs_srcdir)/install-tree
make install DESTDIR=$(abs_srcdir)/install-tree
tree $(abs_srcdir)/install-tree
......@@ -8,8 +8,9 @@ CHANGES WITH 182:
udev though, will require the *build* of the systemd tree, but
udev can be properly *run* without systems.
* udev: /lib/udev/devices/ are not read anymore; tmpfiles should
be used to create workarounds for broken subsystems.
* udev: /lib/udev/devices/ are not read anymore; systemde-tmpfiles
should be used to create dead device nodes as workarounds for broken
subsystems.
* udev: RUN+="socket:..." and udev_monitor_new_from_socket() is
no longer supported. udev_monitor_new_from_netlink() needs to be
......@@ -22,6 +23,11 @@ CHANGES WITH 182:
pulled-in by udev to ge started, but they can no longer be directly
forked by udev rules.
* udev: the daemon binary is called systemd-udevd now and installed
in /usr/lib/systemd/. Standalone builds or non-systemd systems need
to adapt to that, create symlink, or rename the binary after building
it.
* systemd-logingctl and systemd-journalctl have been renamed
to logingctl and journalctl to match systemctl.
......
......@@ -3,7 +3,7 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="udevd">
<refentry id="systemd-udevd">
<refentryinfo>
<title>udevd</title>
<productname>systemd</productname>
......@@ -18,18 +18,18 @@
</refentryinfo>
<refmeta>
<refentrytitle>udevd</refentrytitle>
<refentrytitle>systemd-udevd</refentrytitle>
<manvolnum>8</manvolnum>
<refmiscinfo class="version"></refmiscinfo>
</refmeta>
<refnamediv>
<refname>udevd</refname><refpurpose>event managing daemon</refpurpose>
<refname>systemd-udevd</refname><refpurpose>event managing daemon</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
<command>udevd</command>
<command>systemd-udevd</command>
<arg><option>--daemon</option></arg>
<arg><option>--debug</option></arg>
<arg><option>--children-max=</option></arg>
......@@ -41,7 +41,7 @@
</refsynopsisdiv>
<refsect1><title>Description</title>
<para>udevd listens to kernel uevents. For every event, udevd executes matching
<para>systemd-udevd listens to kernel uevents. For every event, systemd-udevd executes matching
instructions specified in udev rules. See <citerefentry>
<refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum>
</citerefentry>.</para>
......@@ -80,7 +80,7 @@
<varlistentry>
<term><option>--resolve-names=</option></term>
<listitem>
<para>Specify when udevd should resolve names of users and groups.
<para>Specify when systemd-udevd should resolve names of users and groups.
When set to <option>early</option> (the default) names will be
resolved when the rules are parsed. When set to
<option>late</option> names will be resolved for every event.
......
......@@ -41,7 +41,7 @@
names provide a way to reliably identify devices based on their properties or
current configuration.</para>
<para>The udev daemon, <citerefentry><refentrytitle>udevd</refentrytitle>
<para>The udev daemon, <citerefentry><refentrytitle>systemd-udevd</refentrytitle>
<manvolnum>8</manvolnum></citerefentry>, receives device uevents directly from
the kernel whenever a device is added or removed from the system, or it changes its
state. When udev receives a device event, it matches its configured set of rules
......@@ -512,7 +512,7 @@
<listitem>
<para>Apply the permissions specified in this rule to the static device node with
the specified name. Static device node creation can be requested by kernel modules.
These nodes might not have a corresponding kernel device at the time udevd is
These nodes might not have a corresponding kernel device at the time systemd-udevd is
started; they can trigger automatic kernel module loading.</para>
</listitem>
</varlistentry>
......@@ -691,7 +691,7 @@
<refsect1>
<title>See Also</title>
<para><citerefentry>
<refentrytitle>udevd</refentrytitle><manvolnum>8</manvolnum>
<refentrytitle>systemd-udevd</refentrytitle><manvolnum>8</manvolnum>
</citerefentry>,
<citerefentry>
<refentrytitle>udevadm</refentrytitle><manvolnum>8</manvolnum>
......
......@@ -322,13 +322,13 @@
<varlistentry>
<term><option>--exit</option></term>
<listitem>
<para>Signal and wait for udevd to exit.</para>
<para>Signal and wait for systemd-udevd to exit.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--log-priority=<replaceable>value</replaceable></option></term>
<listitem>
<para>Set the internal log level of udevd. Valid values are the numerical
<para>Set the internal log level of systemd-udevd. Valid values are the numerical
syslog priorities or their textual representations: <option>err</option>,
<option>info</option> and <option>debug</option>.</para>
</listitem>
......@@ -336,20 +336,20 @@
<varlistentry>
<term><option>--stop-exec-queue</option></term>
<listitem>
<para>Signal udevd to stop executing new events. Incoming events
<para>Signal systemd-udevd to stop executing new events. Incoming events
will be queued.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--start-exec-queue</option></term>
<listitem>
<para>Signal udevd to enable the execution of events.</para>
<para>Signal systemd-udevd to enable the execution of events.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--reload</option></term>
<listitem>
<para>Signal udevd to reload the rules files and other databases like the kernel
<para>Signal systemd-udevd to reload the rules files and other databases like the kernel
module index. Reloading rules and databases does not apply any changes to already
existing devices; the new configuration will only be applied to new events.</para>
</listitem>
......@@ -363,14 +363,14 @@
<varlistentry>
<term><option>--children-max=</option><replaceable>value</replaceable></term>
<listitem>
<para>Set the maximum number of events, udevd will handle at the
<para>Set the maximum number of events, systemd-udevd will handle at the
same time.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--timeout=</option><replaceable>seconds</replaceable></term>
<listitem>
<para>The maximum number seconds to wait for a reply from udevd.</para>
<para>The maximum number seconds to wait for a reply from systemd-udevd.</para>
</listitem>
</varlistentry>
<varlistentry>
......@@ -470,7 +470,7 @@
<refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum>
</citerefentry>
<citerefentry>
<refentrytitle>udevd</refentrytitle><manvolnum>8</manvolnum>
<refentrytitle>systemd-udevd</refentrytitle><manvolnum>8</manvolnum>
</citerefentry></para>
</refsect1>
</refentry>
......@@ -41,6 +41,6 @@ systemd-update-utmp-shutdown.service
test-env-replace
systemd-binfmt.service
emergency.service
/udev-settle.service
/udev-trigger.service
/udev.service
/systemd-udev-settle.service
/systemd-udev-trigger.service
/systemd-udev.service
......@@ -9,6 +9,6 @@ ConditionCapability=CAP_MKNOD
[Service]
Type=notify
OOMScoreAdjust=-1000
Sockets=udev-control.socket udev-kernel.socket
Sockets=systemd-udev-control.socket systemd-udev-kernel.socket
Restart=on-failure
ExecStart=@udevlibexecdir@/udevd
ExecStart=@rootlibexecdir@/systemd-udevd
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment