diff options
Diffstat (limited to 'src/grp-udev')
-rw-r--r-- | src/grp-udev/50-udev-default.rules (renamed from src/grp-udev/rules/50-udev-default.rules) | 0 | ||||
-rw-r--r-- | src/grp-udev/60-block.rules (renamed from src/grp-udev/rules/60-block.rules) | 0 | ||||
-rw-r--r-- | src/grp-udev/60-drm.rules (renamed from src/grp-udev/rules/60-drm.rules) | 0 | ||||
-rw-r--r-- | src/grp-udev/60-evdev.rules (renamed from src/grp-udev/rules/60-evdev.rules) | 0 | ||||
-rw-r--r-- | src/grp-udev/60-persistent-alsa.rules (renamed from src/grp-udev/rules/60-persistent-alsa.rules) | 0 | ||||
-rw-r--r-- | src/grp-udev/60-persistent-input.rules (renamed from src/grp-udev/rules/60-persistent-input.rules) | 0 | ||||
-rw-r--r-- | src/grp-udev/60-persistent-storage-tape.rules (renamed from src/grp-udev/rules/60-persistent-storage-tape.rules) | 0 | ||||
-rw-r--r-- | src/grp-udev/60-persistent-storage.rules (renamed from src/grp-udev/rules/60-persistent-storage.rules) | 0 | ||||
-rw-r--r-- | src/grp-udev/60-serial.rules (renamed from src/grp-udev/rules/60-serial.rules) | 0 | ||||
-rw-r--r-- | src/grp-udev/64-btrfs.rules (renamed from src/grp-udev/rules/64-btrfs.rules) | 0 | ||||
-rw-r--r-- | src/grp-udev/70-mouse.rules (renamed from src/grp-udev/rules/70-mouse.rules) | 0 | ||||
-rw-r--r-- | src/grp-udev/75-net-description.rules (renamed from src/grp-udev/rules/75-net-description.rules) | 0 | ||||
-rw-r--r-- | src/grp-udev/78-sound-card.rules (renamed from src/grp-udev/rules/78-sound-card.rules) | 0 | ||||
-rw-r--r-- | src/grp-udev/80-drivers.rules (renamed from src/grp-udev/rules/80-drivers.rules) | 0 | ||||
-rw-r--r-- | src/grp-udev/80-net-setup-link.rules (renamed from src/grp-udev/rules/80-net-setup-link.rules) | 0 | ||||
-rw-r--r-- | src/grp-udev/99-systemd.rules.in (renamed from src/grp-udev/rules/99-systemd.rules.in) | 0 | ||||
-rw-r--r-- | src/grp-udev/Makefile | 6 | ||||
-rw-r--r-- | src/grp-udev/cdrom_id/60-cdrom_id.rules (renamed from src/grp-udev/rules/60-cdrom_id.rules) | 0 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/Makefile | 3 | ||||
l--------- | src/grp-udev/libudev-core/logind-acl.c | 2 | ||||
l--------- | src/grp-udev/libudev-core/logind-acl.h | 2 | ||||
-rw-r--r-- | src/grp-udev/mtd_probe/75-probe_mtd.rules (renamed from src/grp-udev/rules/75-probe_mtd.rules) | 0 | ||||
-rw-r--r-- | src/grp-udev/systemd-udevd/systemd-udevd.service.in | 26 | ||||
-rw-r--r-- | src/grp-udev/v4l_id/60-persistent-v4l.rules (renamed from src/grp-udev/rules/60-persistent-v4l.rules) | 0 |
24 files changed, 33 insertions, 6 deletions
diff --git a/src/grp-udev/rules/50-udev-default.rules b/src/grp-udev/50-udev-default.rules index e9eeb8518e..e9eeb8518e 100644 --- a/src/grp-udev/rules/50-udev-default.rules +++ b/src/grp-udev/50-udev-default.rules diff --git a/src/grp-udev/rules/60-block.rules b/src/grp-udev/60-block.rules index c74caca49f..c74caca49f 100644 --- a/src/grp-udev/rules/60-block.rules +++ b/src/grp-udev/60-block.rules diff --git a/src/grp-udev/rules/60-drm.rules b/src/grp-udev/60-drm.rules index 1ed3e445f2..1ed3e445f2 100644 --- a/src/grp-udev/rules/60-drm.rules +++ b/src/grp-udev/60-drm.rules diff --git a/src/grp-udev/rules/60-evdev.rules b/src/grp-udev/60-evdev.rules index ade7e7f646..ade7e7f646 100644 --- a/src/grp-udev/rules/60-evdev.rules +++ b/src/grp-udev/60-evdev.rules diff --git a/src/grp-udev/rules/60-persistent-alsa.rules b/src/grp-udev/60-persistent-alsa.rules index 8154e2dbb5..8154e2dbb5 100644 --- a/src/grp-udev/rules/60-persistent-alsa.rules +++ b/src/grp-udev/60-persistent-alsa.rules diff --git a/src/grp-udev/rules/60-persistent-input.rules b/src/grp-udev/60-persistent-input.rules index 0e33e68384..0e33e68384 100644 --- a/src/grp-udev/rules/60-persistent-input.rules +++ b/src/grp-udev/60-persistent-input.rules diff --git a/src/grp-udev/rules/60-persistent-storage-tape.rules b/src/grp-udev/60-persistent-storage-tape.rules index f2eabd92a8..f2eabd92a8 100644 --- a/src/grp-udev/rules/60-persistent-storage-tape.rules +++ b/src/grp-udev/60-persistent-storage-tape.rules diff --git a/src/grp-udev/rules/60-persistent-storage.rules b/src/grp-udev/60-persistent-storage.rules index 408733915c..408733915c 100644 --- a/src/grp-udev/rules/60-persistent-storage.rules +++ b/src/grp-udev/60-persistent-storage.rules diff --git a/src/grp-udev/rules/60-serial.rules b/src/grp-udev/60-serial.rules index f303e27fd5..f303e27fd5 100644 --- a/src/grp-udev/rules/60-serial.rules +++ b/src/grp-udev/60-serial.rules diff --git a/src/grp-udev/rules/64-btrfs.rules b/src/grp-udev/64-btrfs.rules index fe0100131e..fe0100131e 100644 --- a/src/grp-udev/rules/64-btrfs.rules +++ b/src/grp-udev/64-btrfs.rules diff --git a/src/grp-udev/rules/70-mouse.rules b/src/grp-udev/70-mouse.rules index 3ea743aff9..3ea743aff9 100644 --- a/src/grp-udev/rules/70-mouse.rules +++ b/src/grp-udev/70-mouse.rules diff --git a/src/grp-udev/rules/75-net-description.rules b/src/grp-udev/75-net-description.rules index 7e62f8b26b..7e62f8b26b 100644 --- a/src/grp-udev/rules/75-net-description.rules +++ b/src/grp-udev/75-net-description.rules diff --git a/src/grp-udev/rules/78-sound-card.rules b/src/grp-udev/78-sound-card.rules index 04740e8b97..04740e8b97 100644 --- a/src/grp-udev/rules/78-sound-card.rules +++ b/src/grp-udev/78-sound-card.rules diff --git a/src/grp-udev/rules/80-drivers.rules b/src/grp-udev/80-drivers.rules index 8551f47a4b..8551f47a4b 100644 --- a/src/grp-udev/rules/80-drivers.rules +++ b/src/grp-udev/80-drivers.rules diff --git a/src/grp-udev/rules/80-net-setup-link.rules b/src/grp-udev/80-net-setup-link.rules index 6e411a91f0..6e411a91f0 100644 --- a/src/grp-udev/rules/80-net-setup-link.rules +++ b/src/grp-udev/80-net-setup-link.rules diff --git a/src/grp-udev/rules/99-systemd.rules.in b/src/grp-udev/99-systemd.rules.in index fb4517606d..fb4517606d 100644 --- a/src/grp-udev/rules/99-systemd.rules.in +++ b/src/grp-udev/99-systemd.rules.in diff --git a/src/grp-udev/Makefile b/src/grp-udev/Makefile index 67e20c65a2..965c9b2f22 100644 --- a/src/grp-udev/Makefile +++ b/src/grp-udev/Makefile @@ -42,6 +42,11 @@ dist_udevrules_DATA += \ rules/78-sound-card.rules \ rules/80-net-setup-link.rules +ifneq ($(HAVE_KMOD),) +dist_udevrules_DATA += \ + rules/80-drivers.rules +endif # HAVE_KMOD + nodist_udevrules_DATA += \ rules/99-systemd.rules @@ -69,7 +74,6 @@ SYSINIT_TARGET_WANTS += \ systemd-udevd.service \ systemd-udev-trigger.service -sd.sed_files += $(notdir $(patsubst %.in,%,$(filter %.in,$(EXTRA_DIST)))) nested.subdirs += systemd-udevd udevadm nested.subdirs += ata_id cdrom_id collect mtd_probe scsi_id v4l_id diff --git a/src/grp-udev/rules/60-cdrom_id.rules b/src/grp-udev/cdrom_id/60-cdrom_id.rules index 5c3b52ebb9..5c3b52ebb9 100644 --- a/src/grp-udev/rules/60-cdrom_id.rules +++ b/src/grp-udev/cdrom_id/60-cdrom_id.rules diff --git a/src/grp-udev/libudev-core/Makefile b/src/grp-udev/libudev-core/Makefile index da72594005..36aaa55431 100644 --- a/src/grp-udev/libudev-core/Makefile +++ b/src/grp-udev/libudev-core/Makefile @@ -80,9 +80,6 @@ libudev_core_la_LIBADD = \ ifneq ($(HAVE_KMOD),) libudev_core_la_SOURCES += \ src/udev/udev-builtin-kmod.c - -dist_udevrules_DATA += \ - rules/80-drivers.rules endif # HAVE_KMOD ifneq ($(HAVE_BLKID),) diff --git a/src/grp-udev/libudev-core/logind-acl.c b/src/grp-udev/libudev-core/logind-acl.c index 9dd626440f..dd15b7973f 120000 --- a/src/grp-udev/libudev-core/logind-acl.c +++ b/src/grp-udev/libudev-core/logind-acl.c @@ -1 +1 @@ -../../grp-login/liblogind-core/logind-acl.c
\ No newline at end of file +../../grp-login/systemd-logind/logind-acl.c
\ No newline at end of file diff --git a/src/grp-udev/libudev-core/logind-acl.h b/src/grp-udev/libudev-core/logind-acl.h index 60f96cbe0a..6065dde301 120000 --- a/src/grp-udev/libudev-core/logind-acl.h +++ b/src/grp-udev/libudev-core/logind-acl.h @@ -1 +1 @@ -../../grp-login/liblogind-core/logind-acl.h
\ No newline at end of file +../../grp-login/systemd-logind/logind-acl.h
\ No newline at end of file diff --git a/src/grp-udev/rules/75-probe_mtd.rules b/src/grp-udev/mtd_probe/75-probe_mtd.rules index 8848aeeaed..8848aeeaed 100644 --- a/src/grp-udev/rules/75-probe_mtd.rules +++ b/src/grp-udev/mtd_probe/75-probe_mtd.rules diff --git a/src/grp-udev/systemd-udevd/systemd-udevd.service.in b/src/grp-udev/systemd-udevd/systemd-udevd.service.in new file mode 100644 index 0000000000..79f28c87c6 --- /dev/null +++ b/src/grp-udev/systemd-udevd/systemd-udevd.service.in @@ -0,0 +1,26 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=udev Kernel Device Manager +Documentation=man:systemd-udevd.service(8) man:udev(7) +DefaultDependencies=no +Wants=systemd-udevd-control.socket systemd-udevd-kernel.socket +After=systemd-udevd-control.socket systemd-udevd-kernel.socket systemd-sysusers.service +Before=sysinit.target +ConditionPathIsReadWrite=/sys + +[Service] +Type=notify +OOMScoreAdjust=-1000 +Sockets=systemd-udevd-control.socket systemd-udevd-kernel.socket +Restart=always +RestartSec=0 +ExecStart=@rootlibexecdir@/systemd-udevd +MountFlags=slave +KillMode=mixed +WatchdogSec=3min diff --git a/src/grp-udev/rules/60-persistent-v4l.rules b/src/grp-udev/v4l_id/60-persistent-v4l.rules index 93c5ee8c27..93c5ee8c27 100644 --- a/src/grp-udev/rules/60-persistent-v4l.rules +++ b/src/grp-udev/v4l_id/60-persistent-v4l.rules |