Skip to content

Commit 06c0ee5

Browse files
committed
(squash) Use meson-defined path prefixes
1 parent 344f237 commit 06c0ee5

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

nvmf-autoconnect/NetworkManager/95-nvme-nbft-no-ignore-carrier.conf.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# For NVMe/TCP connections that provide namespaces containing rootfs
44
# it is crucial to react on carrier events and reconnect any missing
55
# NVMe/TCP connections as defined in the ACPI NBFT table. A custom
6-
# /usr/lib/NetworkManager/dispatcher.d/99-nvme-nbft-connect.sh hook
6+
# @NETWORKMANAGERDIR@dispatcher.d/99-nvme-nbft-connect.sh hook
77
# will respawn nvmf-connect-nbft.service on such occasion.
88
#
99
# This file acts as an override to any config directives that disable

nvmf-autoconnect/systemd/nbft-boot-connect.service.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Restart=on-failure
2121
RestartSec=10
2222
StartLimitIntervalSec=0
2323
StartLimitBurst=0
24-
ExecStart=/usr/sbin/nvme connect-all --nbft
24+
ExecStart=@SBINDIR@/nvme connect-all --nbft
2525

2626
[Install]
2727
WantedBy=sysinit.target

nvmf-autoconnect/systemd/nbft-boot-pre.service.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ Before=systemd-udevd.service
1010

1111
[Service]
1212
Type=oneshot
13-
ExecStartPre=-/usr/bin/mkdir -p /etc/systemd/network
13+
ExecStartPre=-/bin/mkdir -p @SYSCONFDIR@/systemd/network
1414
# generate udev link files
15-
ExecStart=/usr/sbin/nvme nbft gen-udev-link-files /etc/systemd/network/
15+
ExecStart=@SBINDIR@/nvme nbft gen-udev-link-files @SYSCONFDIR@/systemd/network/
1616

1717
[Install]
1818
WantedBy=sysinit.target

0 commit comments

Comments
 (0)