diff options
author | 7heo <7heo@mail.com> | 2016-09-17 14:42:53 +0200 |
---|---|---|
committer | 7heo <7heo@mail.com> | 2016-09-28 00:13:43 +0200 |
commit | 14361e7589675a8032485780173e1cc71de2132f (patch) | |
tree | 1ab9ad332b4e6353d1d0b7b319b304e014c1cc65 /nlplug-findfs.c | |
parent | 4893f510f80d26f4cc5321381084904109c1cbe9 (diff) | |
download | mkinitfs-14361e7589675a8032485780173e1cc71de2132f.tar.bz2 mkinitfs-14361e7589675a8032485780173e1cc71de2132f.tar.xz |
nlplug-findfs: fix erratic behavior and SIGSEGV
Likely introduced in the major rehaul done in
e4af128b30855b2b29a27c2fd7580b62059bbe51
Diffstat (limited to 'nlplug-findfs.c')
-rw-r--r-- | nlplug-findfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nlplug-findfs.c b/nlplug-findfs.c index df62651..78a5ebe 100644 --- a/nlplug-findfs.c +++ b/nlplug-findfs.c @@ -727,7 +727,7 @@ static int dispatch_uevent(struct uevent *ev, struct ueventconf *conf) if (rc) return rc; - if (searchdev(ev, conf->crypt.device, NULL, NULL)) { + if (conf->crypt.devnode[0] == '\0' && searchdev(ev, conf->crypt.device, NULL, NULL)) { strncpy(conf->crypt.devnode, conf->crypt.device[0] == '/' ? conf->crypt.device : ev->devnode, sizeof(conf->crypt.devnode)); |