[rhel6-branch] Don't raise an error on driveorder disks (#1014658)

Vratislav Podzimek vpodzime at redhat.com
Wed Oct 16 07:04:52 UTC 2013


On Tue, 2013-10-15 at 11:01 -0700, Brian C. Lane wrote:
> From: "Brian C. Lane" <bcl at redhat.com>
> 
> Some devices may not be present during kickstart parse, so when there is
> no match revert to previous behavior and just use the name as-is.
> 
> Resolves: rhbz#1014658
> ---
>  kickstart.py | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/kickstart.py b/kickstart.py
> index 1c113a8..3091299 100644
> --- a/kickstart.py
> +++ b/kickstart.py
> @@ -262,13 +262,14 @@ class Bootloader(commands.bootloader.RHEL6_Bootloader):
>          retval = commands.bootloader.RHEL6_Bootloader.parse(self, args)
>  
>          # Expand the drives in driveorder so that things like /dev/disk/by-* will work
> +        # Devices that cannot be found are used as-is, eg. un-assembled RAID
>          drives = []
>          for drive in self.driveorder:
>              matched = deviceMatches(drive)
>              if matched:
>                  drives.extend(matched)
>              else:
> -                raise KickstartValueError, formatErrorMsg(self.lineno, msg="Specified nonexistent disk %s in bootloader command" % drive)
> +                drives.append(drive)
>          self.driveorder = drives
>  
>          return retval
ACK.

-- 
Vratislav Podzimek

Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic



More information about the anaconda-patches mailing list