Changed the startup trigger to net-device-up
Merge