[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH F13Blocker] Don't add recovery partitions to the grub boot menu (#534066)



> diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py
> index 610195f..0b50f7f 100644
> --- a/booty/bootloaderInfo.py
> +++ b/booty/bootloaderInfo.py
> @@ -281,14 +281,16 @@ class BootImages:
>  
>              type = part.format.type
>  
> -            if type in dosFilesystems and not foundDos and doesDualBoot():
> +            if type in dosFilesystems and not foundDos and doesDualBoot() and \
> +               not part.getFlag(parted.PARTITION_DIAG):
>                  try:
>                      bootable = checkForBootBlock(part.path)
>                      retval.append((part, type))
>                      foundDos = True
>                  except:
>                      pass
> -            elif type in ["ntfs", "hpfs"] and not foundDos and doesDualBoot():
> +            elif type in ["ntfs", "hpfs"] and not foundDos and \
> +                 doesDualBoot() and not part.getFlag(parted.PARTITION_DIAG):
>                  retval.append((part, type))
>                  # maybe questionable, but the first ntfs or fat is likely to
>                  # be the correct one to boot with XP using ntfs

ACK.

Incidentally, that second case is never going to get run for NTFS and
HPFS given what dosFilesystems looks like:

booty/bootloaderInfo.py:dosFilesystems = ('FAT', 'fat16', 'fat32', 'ntfs', 'hpfs')

- Chris


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]