handle ifcfg options also when using dhcp

ifcfg option handling wrongly ended up in a !dhcp block.. The below patch just moves the code out of that block.