disk_custom_with_swap: drop root part size to 6G
    
    With the new 2G max EFI system partition size, we were trying to
    stuff 12G of Fedora into a 10G disk. That wasn't going to work.
    
    Signed-off-by: Adam Williamson <awilliam@redhat.com>