From 589986012c4b3ab68e299a2eadca18f90080113b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 14 Jul 2022 20:28:04 +0200 Subject: Merging upstream version 2.0. Signed-off-by: Daniel Baumann --- nvmf-autoconnect/systemd/nvmefc-boot-connections.service | 10 ---------- .../systemd/nvmefc-boot-connections.service.in | 10 ++++++++++ nvmf-autoconnect/systemd/nvmf-autoconnect.service | 13 ------------- nvmf-autoconnect/systemd/nvmf-autoconnect.service.in | 13 +++++++++++++ nvmf-autoconnect/systemd/nvmf-connect.target | 2 -- nvmf-autoconnect/systemd/nvmf-connect.target.in | 2 ++ nvmf-autoconnect/systemd/nvmf-connect@.service | 14 -------------- nvmf-autoconnect/systemd/nvmf-connect@.service.in | 14 ++++++++++++++ 8 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 nvmf-autoconnect/systemd/nvmefc-boot-connections.service create mode 100644 nvmf-autoconnect/systemd/nvmefc-boot-connections.service.in delete mode 100644 nvmf-autoconnect/systemd/nvmf-autoconnect.service create mode 100644 nvmf-autoconnect/systemd/nvmf-autoconnect.service.in delete mode 100644 nvmf-autoconnect/systemd/nvmf-connect.target create mode 100644 nvmf-autoconnect/systemd/nvmf-connect.target.in delete mode 100644 nvmf-autoconnect/systemd/nvmf-connect@.service create mode 100644 nvmf-autoconnect/systemd/nvmf-connect@.service.in (limited to 'nvmf-autoconnect/systemd') diff --git a/nvmf-autoconnect/systemd/nvmefc-boot-connections.service b/nvmf-autoconnect/systemd/nvmefc-boot-connections.service deleted file mode 100644 index 33ab8c1..0000000 --- a/nvmf-autoconnect/systemd/nvmefc-boot-connections.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Auto-connect to subsystems on FC-NVME devices found during boot -ConditionPathExists=/sys/class/fc/fc_udev_device/nvme_discovery - -[Service] -Type=oneshot -ExecStart=/bin/sh -c "echo add > /sys/class/fc/fc_udev_device/nvme_discovery" - -[Install] -WantedBy=default.target diff --git a/nvmf-autoconnect/systemd/nvmefc-boot-connections.service.in b/nvmf-autoconnect/systemd/nvmefc-boot-connections.service.in new file mode 100644 index 0000000..33ab8c1 --- /dev/null +++ b/nvmf-autoconnect/systemd/nvmefc-boot-connections.service.in @@ -0,0 +1,10 @@ +[Unit] +Description=Auto-connect to subsystems on FC-NVME devices found during boot +ConditionPathExists=/sys/class/fc/fc_udev_device/nvme_discovery + +[Service] +Type=oneshot +ExecStart=/bin/sh -c "echo add > /sys/class/fc/fc_udev_device/nvme_discovery" + +[Install] +WantedBy=default.target diff --git a/nvmf-autoconnect/systemd/nvmf-autoconnect.service b/nvmf-autoconnect/systemd/nvmf-autoconnect.service deleted file mode 100644 index b1be272..0000000 --- a/nvmf-autoconnect/systemd/nvmf-autoconnect.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Connect NVMe-oF subsystems automatically during boot -ConditionPathExists=/etc/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 - -[Install] -WantedBy=default.target diff --git a/nvmf-autoconnect/systemd/nvmf-autoconnect.service.in b/nvmf-autoconnect/systemd/nvmf-autoconnect.service.in new file mode 100644 index 0000000..d83d9a1 --- /dev/null +++ b/nvmf-autoconnect/systemd/nvmf-autoconnect.service.in @@ -0,0 +1,13 @@ +[Unit] +Description=Connect NVMe-oF subsystems automatically during boot +ConditionPathExists=@SYSCONFDIR@/nvme/discovery.conf +After=network-online.target +Before=remote-fs-pre.target + +[Service] +Type=oneshot +ExecStartPre=/sbin/modprobe nvme-fabrics +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 deleted file mode 100644 index f64a37c..0000000 --- a/nvmf-autoconnect/systemd/nvmf-connect.target +++ /dev/null @@ -1,2 +0,0 @@ -[Unit] -Description=All instances of nvmf-autoconnect daemon diff --git a/nvmf-autoconnect/systemd/nvmf-connect.target.in b/nvmf-autoconnect/systemd/nvmf-connect.target.in new file mode 100644 index 0000000..f64a37c --- /dev/null +++ b/nvmf-autoconnect/systemd/nvmf-connect.target.in @@ -0,0 +1,2 @@ +[Unit] +Description=All instances of nvmf-autoconnect daemon diff --git a/nvmf-autoconnect/systemd/nvmf-connect@.service b/nvmf-autoconnect/systemd/nvmf-connect@.service deleted file mode 100644 index 5fbf081..0000000 --- a/nvmf-autoconnect/systemd/nvmf-connect@.service +++ /dev/null @@ -1,14 +0,0 @@ -# -# Unit file used by 70-nvmf-autoconnect.rules. -# - -[Unit] -Description=NVMf auto-connect scan upon nvme discovery controller Events -After=syslog.target -PartOf=nvmf-connect.target -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}'`" diff --git a/nvmf-autoconnect/systemd/nvmf-connect@.service.in b/nvmf-autoconnect/systemd/nvmf-connect@.service.in new file mode 100644 index 0000000..90f774c --- /dev/null +++ b/nvmf-autoconnect/systemd/nvmf-connect@.service.in @@ -0,0 +1,14 @@ +# +# Unit file used by 70-nvmf-autoconnect.rules. +# + +[Unit] +Description=NVMf auto-connect scan upon nvme discovery controller Events +After=syslog.target +PartOf=nvmf-connect.target +Requires=nvmf-connect.target + +[Service] +Type=simple +Environment="CONNECT_ARGS=%i" +ExecStart=/bin/sh -c "@SBINDIR@/nvme connect-all --quiet `/bin/echo -e '${CONNECT_ARGS}'`" -- cgit v1.2.3