diff options
| author | Luca Boccassi <bluca@debian.org> | 2023-06-12 03:15:19 +0200 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2023-07-28 20:34:03 +0200 |
| commit | b0d3095fd6cc1791a38f57a1982116b4475244ba (patch) | |
| tree | f415bd813a7e07599c969fdd4965390bfdf38cd6 /rules.d | |
| parent | Merge pull request #28551 from mrc0mmand/unit-cleanup-set (diff) | |
| download | systemd-b0d3095fd6cc1791a38f57a1982116b4475244ba.tar.xz systemd-b0d3095fd6cc1791a38f57a1982116b4475244ba.zip | |
Drop split-usr and unmerged-usr support
As previously announced, execute order 66:
https://lists.freedesktop.org/archives/systemd-devel/2022-September/048352.html
The meson options split-usr, rootlibdir and rootprefix become no-ops
that print a warning if they are set to anything other than the
default values. We can remove them in a future release.
Diffstat (limited to 'rules.d')
| -rw-r--r-- | rules.d/64-btrfs.rules.in | 2 | ||||
| -rw-r--r-- | rules.d/71-seat.rules.in | 4 | ||||
| -rw-r--r-- | rules.d/99-systemd.rules.in | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/rules.d/64-btrfs.rules.in b/rules.d/64-btrfs.rules.in index df6e12a5dd..039d759f62 100644 --- a/rules.d/64-btrfs.rules.in +++ b/rules.d/64-btrfs.rules.in @@ -12,6 +12,6 @@ IMPORT{builtin}="btrfs ready $devnode" ENV{ID_BTRFS_READY}=="0", ENV{SYSTEMD_READY}="0" # reconsider pending devices in case when multidevice volume awaits -ENV{ID_BTRFS_READY}=="1", RUN+="{{ROOTBINDIR}}/udevadm trigger -s block -p ID_BTRFS_READY=0" +ENV{ID_BTRFS_READY}=="1", RUN+="{{BINDIR}}/udevadm trigger -s block -p ID_BTRFS_READY=0" LABEL="btrfs_end" diff --git a/rules.d/71-seat.rules.in b/rules.d/71-seat.rules.in index 25e4ee7e58..1fd7ec23b0 100644 --- a/rules.d/71-seat.rules.in +++ b/rules.d/71-seat.rules.in @@ -71,11 +71,11 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="17e9", ATTR{idProduct}=="401a", ATTR{product} SUBSYSTEM=="usb", ATTR{idVendor}=="17e9", ATTR{idProduct}=="401a", ATTR{product}=="mimo inc", \ ATTR{../idVendor}=="058f", ATTR{../idProduct}=="6254", \ ENV{ID_AVOID_LOOP}=="", \ - RUN+="{{ROOTBINDIR}}/udevadm trigger --parent-match=%p/.." + RUN+="{{BINDIR}}/udevadm trigger --parent-match=%p/.." TAG=="seat", ENV{ID_PATH}=="", IMPORT{builtin}="path_id" TAG=="seat", ENV{ID_FOR_SEAT}=="", ENV{ID_PATH_TAG}!="", ENV{ID_FOR_SEAT}="$env{SUBSYSTEM}-$env{ID_PATH_TAG}" -SUBSYSTEM=="input", ATTR{name}=="Wiebetech LLC Wiebetech", RUN+="{{ROOTBINDIR}}/loginctl lock-sessions" +SUBSYSTEM=="input", ATTR{name}=="Wiebetech LLC Wiebetech", RUN+="{{BINDIR}}/loginctl lock-sessions" LABEL="seat_end" diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in index c0defc31de..b5a2b6aaea 100644 --- a/rules.d/99-systemd.rules.in +++ b/rules.d/99-systemd.rules.in @@ -63,7 +63,7 @@ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??: SUBSYSTEM=="udc", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}+="usb-gadget.target" # Apply sysctl variables to network devices (and only to those) as they appear. -ACTION=="add", SUBSYSTEM=="net", KERNEL!="lo", RUN+="{{ROOTLIBEXECDIR}}/systemd-sysctl --prefix=/net/ipv4/conf/$name --prefix=/net/ipv4/neigh/$name --prefix=/net/ipv6/conf/$name --prefix=/net/ipv6/neigh/$name" +ACTION=="add", SUBSYSTEM=="net", KERNEL!="lo", RUN+="{{LIBEXECDIR}}/systemd-sysctl --prefix=/net/ipv4/conf/$name --prefix=/net/ipv4/neigh/$name --prefix=/net/ipv6/conf/$name --prefix=/net/ipv6/neigh/$name" {% if ENABLE_BACKLIGHT %} # Pull in backlight save/restore for all backlight devices and |