Finish util-linux split out