[rhel7-branch][PATCH] Don't ignore the directory of the driver disk iso file
Brian C. Lane
bcl at redhat.com
Wed Feb 26 16:04:05 UTC 2014
On Wed, Feb 26, 2014 at 01:29:08PM +0100, Vratislav Podzimek wrote:
> DD iso file may be somewhere deep in the filesystem, we need to take that into
> account.
>
> Related: rhbz#1036765
> Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
> ---
> dracut/driver-updates | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/dracut/driver-updates b/dracut/driver-updates
> index ea73981..d89ba42 100755
> --- a/dracut/driver-updates
> +++ b/dracut/driver-updates
> @@ -669,8 +669,9 @@ def select_iso():
> return select_iso()
>
> isos = list()
> - for _path, _dirs, files in os.walk(mnt):
> - isos += (iso_file for iso_file in files if iso_file.endswith(".iso"))
> + for dir_path, _dirs, files in os.walk(mnt):
> + isos += (os.path.join(dir_path, iso_file)
> + for iso_file in files if iso_file.endswith(".iso"))
>
> if not isos:
> print("===No ISO files found on %s!===\n" % iso_dev.device)
> @@ -688,7 +689,7 @@ def select_iso():
> if not dd_iso:
> return (None, None)
>
> - return ("/media/DD-search/" + dd_iso, "/media/DD-search")
> + return (dd_iso, "/media/DD-search")
>
> def dd_scan(skip_dds=None, scan_dd_args=True):
> """ Scan the system for OEMDRV devices and and specified by dd=/dev/<device>
> --
> 1.8.5.3
ACK
--
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)
More information about the anaconda-patches
mailing list