diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-09-04 09:15:27 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-09-04 09:15:27 +0000 |
| commit | 425e2c731a79f34454b3b7b35b29040304850197 (patch) | |
| tree | 61210e82c8a610c113334f9956ef06f4cb0f3396 /usr | |
| parent | Releasing debian version 2.3~rc3-1. (diff) | |
| download | nvme-stas-425e2c731a79f34454b3b7b35b29040304850197.tar.xz nvme-stas-425e2c731a79f34454b3b7b35b29040304850197.zip | |
Merging upstream version 2.3~rc4.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/lib/systemd/system/meson.build | 2 | ||||
| -rw-r--r-- | usr/lib/systemd/system/stas-config@.service | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr/lib/systemd/system/meson.build b/usr/lib/systemd/system/meson.build index 0076b01..9fbc877 100644 --- a/usr/lib/systemd/system/meson.build +++ b/usr/lib/systemd/system/meson.build @@ -26,7 +26,7 @@ configure_file( input: 'stas-config@.service', output: 'stas-config@.service', install_dir: sd_unit_dir, - copy: true, + configuration: conf, ) configure_file( diff --git a/usr/lib/systemd/system/stas-config@.service b/usr/lib/systemd/system/stas-config@.service index f070a3c..620825c 100644 --- a/usr/lib/systemd/system/stas-config@.service +++ b/usr/lib/systemd/system/stas-config@.service @@ -5,13 +5,13 @@ # This file is part of NVMe STorage Appliance Services (nvme-stas). # [Unit] -Description=nvme-stas /etc/nvme/%i auto-generation +Description=nvme-stas @ETC@/nvme/%i auto-generation Documentation=man:stas-config@.service(8) -ConditionFileNotEmpty=|!/etc/nvme/%i +ConditionFileNotEmpty=|!@ETC@/nvme/%i [Service] Type=oneshot -ExecStart=/usr/bin/stasadm %i -f /etc/nvme/%i +ExecStart=/usr/bin/stasadm %i -f @ETC@/nvme/%i [Install] WantedBy=stas-config.target |