diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-07-14 18:28:04 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-07-16 15:12:07 +0000 |
| commit | 589986012c4b3ab68e299a2eadca18f90080113b (patch) | |
| tree | f29a53b04a1950cdddae69344bccb3f0146fa728 /nvmf-autoconnect/systemd | |
| parent | Releasing debian version 1.16-4. (diff) | |
| download | nvme-cli-589986012c4b3ab68e299a2eadca18f90080113b.tar.xz nvme-cli-589986012c4b3ab68e299a2eadca18f90080113b.zip | |
Merging upstream version 2.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'nvmf-autoconnect/systemd')
| -rw-r--r-- | nvmf-autoconnect/systemd/nvmefc-boot-connections.service.in (renamed from nvmf-autoconnect/systemd/nvmefc-boot-connections.service) | 0 | ||||
| -rw-r--r-- | nvmf-autoconnect/systemd/nvmf-autoconnect.service.in (renamed from nvmf-autoconnect/systemd/nvmf-autoconnect.service) | 4 | ||||
| -rw-r--r-- | nvmf-autoconnect/systemd/nvmf-connect.target.in (renamed from nvmf-autoconnect/systemd/nvmf-connect.target) | 0 | ||||
| -rw-r--r-- | nvmf-autoconnect/systemd/nvmf-connect@.service.in (renamed from nvmf-autoconnect/systemd/nvmf-connect@.service) | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/nvmf-autoconnect/systemd/nvmefc-boot-connections.service b/nvmf-autoconnect/systemd/nvmefc-boot-connections.service.in index 33ab8c1..33ab8c1 100644 --- a/nvmf-autoconnect/systemd/nvmefc-boot-connections.service +++ b/nvmf-autoconnect/systemd/nvmefc-boot-connections.service.in diff --git a/nvmf-autoconnect/systemd/nvmf-autoconnect.service b/nvmf-autoconnect/systemd/nvmf-autoconnect.service.in index b1be272..d83d9a1 100644 --- a/nvmf-autoconnect/systemd/nvmf-autoconnect.service +++ b/nvmf-autoconnect/systemd/nvmf-autoconnect.service.in @@ -1,13 +1,13 @@ [Unit] Description=Connect NVMe-oF subsystems automatically during boot -ConditionPathExists=/etc/nvme/discovery.conf +ConditionPathExists=@SYSCONFDIR@/nvme/discovery.conf After=network-online.target Before=remote-fs-pre.target [Service] Type=oneshot ExecStartPre=/sbin/modprobe nvme-fabrics -ExecStart=/usr/sbin/nvme connect-all +ExecStart=@SBINDIR@/nvme connect-all [Install] WantedBy=default.target diff --git a/nvmf-autoconnect/systemd/nvmf-connect.target b/nvmf-autoconnect/systemd/nvmf-connect.target.in index f64a37c..f64a37c 100644 --- a/nvmf-autoconnect/systemd/nvmf-connect.target +++ b/nvmf-autoconnect/systemd/nvmf-connect.target.in diff --git a/nvmf-autoconnect/systemd/nvmf-connect@.service b/nvmf-autoconnect/systemd/nvmf-connect@.service.in index 5fbf081..90f774c 100644 --- a/nvmf-autoconnect/systemd/nvmf-connect@.service +++ b/nvmf-autoconnect/systemd/nvmf-connect@.service.in @@ -11,4 +11,4 @@ Requires=nvmf-connect.target [Service] Type=simple Environment="CONNECT_ARGS=%i" -ExecStart=/bin/sh -c "nvme connect-all --matching --quiet `/bin/echo -e '${CONNECT_ARGS}'`" +ExecStart=/bin/sh -c "@SBINDIR@/nvme connect-all --quiet `/bin/echo -e '${CONNECT_ARGS}'`" |