In anticipation of more features, increase number of config flags
allowed, and move the init flags.
Signed-off-by: NKristen Carlson Accardi <kristen.c.accardi@intel.com>
Cc: Hugh Dickens <hugh@veritas.com>
Signed-off-by: NJeff Garzik <jeff@garzik.org>