reposetup: code cleanup

Conflicts:
	menu/reposetup