]>
Commit | Line | Data |
---|---|---|
a8a1a634 JB |
1 | --- systemd-240/meson.build.orig 2018-12-21 19:53:33.000000000 +0100 |
2 | +++ systemd-240/meson.build 2019-01-13 10:00:36.555639211 +0100 | |
3 | @@ -243,6 +243,7 @@ | |
f06261ce AM |
4 | substs.set('pkgsysconfdir', pkgsysconfdir) |
5 | substs.set('bindir', bindir) | |
6 | substs.set('rootbindir', rootbindir) | |
7 | +substs.set('rootsbindir', rootsbindir) | |
8 | substs.set('rootlibexecdir', rootlibexecdir) | |
9 | substs.set('systemunitdir', systemunitdir) | |
10 | substs.set('userunitdir', userunitdir) | |
a919bc1d | 11 | @@ -2667,7 +2668,7 @@ |
f06261ce AM |
12 | libblkid], |
13 | install_rpath : udev_rpath, | |
14 | install : true, | |
15 | - install_dir : rootbindir) | |
16 | + install_dir : rootsbindir) | |
a919bc1d | 17 | public_programs += exe |
f06261ce AM |
18 | |
19 | executable('systemd-shutdown', | |
a5e88385 JR |
20 | --- systemd-183/units/systemd-udev-trigger.service.in~ 2012-05-21 15:14:51.642981269 +0200 |
21 | +++ systemd-183/units/systemd-udev-trigger.service.in 2012-05-30 13:55:20.229509590 +0200 | |
9538a6a4 | 22 | @@ -17,5 +17,5 @@ |
a5e88385 JR |
23 | [Service] |
24 | Type=oneshot | |
25 | RemainAfterExit=yes | |
9538a6a4 JR |
26 | -ExecStart=@rootbindir@/udevadm trigger --type=subsystems --action=add |
27 | -ExecStart=@rootbindir@/udevadm trigger --type=devices --action=add | |
28 | +ExecStart=@rootsbindir@/udevadm trigger --type=subsystems --action=add | |
29 | +ExecStart=@rootsbindir@/udevadm trigger --type=devices --action=add | |
a5e88385 JR |
30 | --- systemd-183/units/systemd-udev-settle.service.in~ 2012-05-30 13:43:34.886201138 +0200 |
31 | +++ systemd-183/units/systemd-udev-settle.service.in 2012-05-30 13:55:44.546175399 +0200 | |
618c1d39 | 32 | @@ -29,4 +29,4 @@ |
a5e88385 JR |
33 | Type=oneshot |
34 | TimeoutSec=180 | |
35 | RemainAfterExit=yes | |
bce90f0e | 36 | -ExecStart=@rootbindir@/udevadm settle |
f06261ce | 37 | +ExecStart=@rootsbindir@/udevadm settle |
bce90f0e JR |
38 | --- systemd-199/units/initrd-udevadm-cleanup-db.service.in~ 2013-03-11 18:01:33.616138706 +0100 |
39 | +++ systemd-199/units/initrd-udevadm-cleanup-db.service.in 2013-03-26 19:09:54.525625477 +0100 | |
40 | @@ -15,4 +15,4 @@ | |
41 | ||
42 | [Service] | |
43 | Type=oneshot | |
44 | -ExecStart=-@rootbindir@/udevadm info --cleanup-db | |
f06261ce | 45 | +ExecStart=-@rootsbindir@/udevadm info --cleanup-db |