(squash) Use meson-defined path prefixes

linux-nvme · Feb 26, 2025 · 06c0ee5 · 06c0ee5
1 parent 344f237
commit 06c0ee5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/nvmf-autoconnect/NetworkManager/95-nvme-nbft-no-ignore-carrier.conf.in b/nvmf-autoconnect/NetworkManager/95-nvme-nbft-no-ignore-carrier.conf.in
@@ -3,7 +3,7 @@
 # For NVMe/TCP connections that provide namespaces containing rootfs
 # it is crucial to react on carrier events and reconnect any missing
 # NVMe/TCP connections as defined in the ACPI NBFT table. A custom
-# /usr/lib/NetworkManager/dispatcher.d/99-nvme-nbft-connect.sh hook
+# @NETWORKMANAGERDIR@dispatcher.d/99-nvme-nbft-connect.sh hook
 # will respawn nvmf-connect-nbft.service on such occasion.
 #
 # This file acts as an override to any config directives that disable

diff --git a/nvmf-autoconnect/systemd/nbft-boot-connect.service.in b/nvmf-autoconnect/systemd/nbft-boot-connect.service.in
@@ -21,7 +21,7 @@ Restart=on-failure
 RestartSec=10
 StartLimitIntervalSec=0
 StartLimitBurst=0
-ExecStart=/usr/sbin/nvme connect-all --nbft
+ExecStart=@SBINDIR@/nvme connect-all --nbft
 
 [Install]
 WantedBy=sysinit.target
diff --git a/nvmf-autoconnect/systemd/nbft-boot-pre.service.in b/nvmf-autoconnect/systemd/nbft-boot-pre.service.in
@@ -10,9 +10,9 @@ Before=systemd-udevd.service
 
 [Service]
 Type=oneshot
-ExecStartPre=-/usr/bin/mkdir -p /etc/systemd/network
+ExecStartPre=-/bin/mkdir -p @SYSCONFDIR@/systemd/network
 # generate udev link files
-ExecStart=/usr/sbin/nvme nbft gen-udev-link-files /etc/systemd/network/
+ExecStart=@SBINDIR@/nvme nbft gen-udev-link-files @SYSCONFDIR@/systemd/network/
 
 [Install]
 WantedBy=sysinit.target