Message ID | 20181209165210.8895-1-zajec5@gmail.com |
---|---|
State | Accepted |
Delegated to: | Rafał Miłecki |
Headers | show |
Series | [OpenWrt-Devel,fstools] block: cleanup handling "start" action of the "autofs" command | expand |
diff --git a/block.c b/block.c index 3d06185..091375f 100644 --- a/block.c +++ b/block.c @@ -1186,12 +1186,16 @@ static int main_autofs(int argc, char **argv) cache_load(0); list_for_each_entry(pr, &devices, list) { - struct mount *m = find_block(pr->uuid, pr->label, NULL, NULL); + struct mount *m; - if (m && m->autofs) - mount_device(pr, TYPE_HOTPLUG); - else - blockd_notify(pr->dev, m, pr); + if (!strcmp(pr->type, "swap")) + continue; + + m = find_block(pr->uuid, pr->label, NULL, NULL); + if (m && m->extroot) + continue; + + blockd_notify(pr->dev, m, pr); } return 0; }