diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2022-08-04 11:53:53 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2022-08-04 11:53:53 +0000 |
| commit | 2abd8980cc93180e6a03523c1583477754ba50eb (patch) | |
| tree | a35b730b92d664185416a65c6dd258152d0e9b89 | |
| parent | 6e21f54b5519af90847d87158ecc75adb5892e1c (diff) | |
| download | mdevd-2abd8980cc93180e6a03523c1583477754ba50eb.tar.gz mdevd-2abd8980cc93180e6a03523c1583477754ba50eb.tar.xz mdevd-2abd8980cc93180e6a03523c1583477754ba50eb.zip | |
Use DEVPATH for mdevd-coldplug testing; don't export MDEV on rebc
Signed-off-by: Laurent Bercot <ska@appnovation.com>
| -rw-r--r-- | src/mdevd/mdevd-coldplug.c | 2 | ||||
| -rw-r--r-- | src/mdevd/mdevd.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/mdevd/mdevd-coldplug.c b/src/mdevd/mdevd-coldplug.c index e692fd4..08e681a 100644 --- a/src/mdevd/mdevd-coldplug.c +++ b/src/mdevd/mdevd-coldplug.c @@ -151,7 +151,7 @@ int main (int argc, char const *const *argv, char const *const *envp) if (strcmp(x, "add")) continue ; x = mdevd_uevent_getvar(&event, "SUBSYSTEM") ; if (strcmp(x, subsystem)) continue ; - x = mdevd_uevent_getvar(&event, "MDEV") ; + x = strrchr(mdevd_uevent_getvar(&event, "DEVPATH"), '/') + 1 ; if (!strcmp(x, mdev)) break ; } } diff --git a/src/mdevd/mdevd.c b/src/mdevd/mdevd.c index 1ac2bc6..1a3c9d2 100644 --- a/src/mdevd/mdevd.c +++ b/src/mdevd/mdevd.c @@ -709,6 +709,7 @@ static inline int run_scriptelem (struct uevent_s *event, scriptelem const *elem } } else spawn_command(storage + elem->command, event, elem->flagexecline, ud) ; + event->varn-- ; event->len -= 6 + nodelen ; } if (elem->movetype != MOVEINFO_NOCREATE && ud->action == ACTION_REMOVE && ud->mmaj >= 0) |