discover/grub2: Add support for -s and -f commands