Move earlier the checks for skipping a hard disk when parsing a CD-DROM,
and for skipping a CD-ROM when parsing a hard disk. This should have no
behaviour changes, and avoids to add repeated checks in following
commits.
Signed-off-by: NPino Toscano <ptoscano@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
Tested-by: NRichard W.M. Jones <rjones@redhat.com>