[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)



-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 05/03/2010 09:04 AM, Hans de Goede wrote:
> ---
>  booty/bootloaderInfo.py |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> 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

I know this is preexisting, but we shouldn't be naming variables 'type' :)

- -- 
Brian C. Lane <bcl redhat com>
Red Hat / Port Orchard, WA
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iQEVAwUBS98ACRF+jBaO/jp/AQJuAAgAn8WP8BxmqkwGeXSbIAw/vV/exRqHpVAI
CKRPCJuMfS3+FEk2ymSzwkM3gU6Tba+AejGy5sAU4/AYN01iI7MGrLrp/Hzat8br
l+ddygQDerz2iXmQz5Uoh0lkGeTiTZ/flv5cxxChy+hek7IEaXiCjYcSD+ZnXHjA
kZOB68Jb6TSc2aG+83li+sz0s4pedYEevb7DhOMGlyFLvNheRvMYUq1t06rMnygL
a0klKcQt0nzhOAU6XzjD9SSC+StfvQRSQr/UB95s+MSFpqjxHSpHniXkPt3osIOK
sz2NmT1rz9ws1yFrQg/AP63T9JGk6KhvWvbTZNGIed6hDjDwd/Qd3g==
=5I2K
-----END PGP SIGNATURE-----


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