Merge pull request #439 from martin-belanger/add-dhchap-secret

udev-rules: use systemd escape char (\x09) instead of \t (tab)

Author: martin-belanger

Makefile

@@ -47,7 +47,8 @@ install: stas
 
 .PHONY: uninstall
 uninstall: ${BUILD-DIR}
-	sudo ninja $@ -C ${BUILD-DIR}
+	cd ${BUILD-DIR} && sudo meson --internal uninstall
+
 
 .PHONY: dist
 dist: stas

staslib/service.py

@@ -510,7 +510,7 @@ def _dc_removed(self):
 UDEV_RULE_OVERRIDE = r'''
 ACTION=="change", SUBSYSTEM=="fc", ENV{FC_EVENT}=="nvmediscovery", \
   ENV{NVMEFC_HOST_TRADDR}=="*",  ENV{NVMEFC_TRADDR}=="*", \
-  RUN+="%s --no-block start nvmf-connect@--transport=fc\t--traddr=$env{NVMEFC_TRADDR}\t--trsvcid=none\t--host-traddr=$env{NVMEFC_HOST_TRADDR}.service"
+  RUN+="%s --no-block restart nvmf-connect@--device\x3dnone\x09--transport\x3dfc\x09--traddr\x3d$env{NVMEFC_TRADDR}\x09--trsvcid\x3dnone\x09--host-traddr\x3d$env{NVMEFC_HOST_TRADDR}.service"
 '''
 
 
@@ -864,10 +864,12 @@ def _nvme_cli_interop(self, udev_obj):
             return
 
         # We need to invoke "nvme connect-all" using nvme-cli's [email protected]
-        # NOTE: Eventually, we'll be able to drop --host-traddr and --host-iface from
+        # NOTE 1: Eventually, we'll be able to drop --host-traddr and --host-iface from
         # the parameters passed to [email protected]. A fix was added to connect-all
         # to infer these two values from the device used to connect to the DC.
         # Ref: https://github.com/linux-nvme/nvme-cli/pull/1812
+        #
+        # NOTE 2:--transport, --traddr, and --trsvcid, not needed when using --device
         cnf = [
             ('--device', udev_obj.sys_name),
             ('--host-traddr', udev_obj.properties.get('NVME_HOST_TRADDR', None)),