Don't try and run it if we don't need to.
Do this here now.
We always have a modmap now.

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
Latest network-manager.

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
Factor this out.

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>