[PATCH] Fix three bugs discovered by driverdisk-disk.ks

Will Woods wwoods at redhat.com
Thu Jul 30 14:56:25 UTC 2015


On Wed, 2015-07-29 at 16:58 -0400, Chris Lumens wrote:
> (1) Get rid of the else branch in addDriverRepos.  Driver disk RPMs 
> may be
> stored under /run/install/DD-* directly, not necessarily in any arch
> -specific
> directory.  If no RPMs are found, we'll fail out at the createrepo 
> step anyway
> so this branch is unnecessary.

Yep - this was a (semi-intentional) behavior change introduced during
the rewrite, so this is the right fix.

> 
> (2) preInstall runs after addDriverRepos, which means the 
> requiredPackages
> list gets blanked out by preInstall.  Thus we do not actually install 
> any RPMs
> from any driver disks.  Append to the list instead of resetting it.

Hey, I love it when testing catches errors.

> (3) In the installer environment, driver disk kernel modules end up 
> in an
> arch-specific directory, not a kernel version-specific directory.

Actually, no - this is another bug discovered by the test!

This bit of driver_updates.py got mixed up when I refactored the
os.uname() calls out:

    ARCH = os.uname()[4]
    KERNELVER = os.uname()[2]

    MODULE_UPDATES_DIR = "/lib/modules/%s/updates" % ARCH

/lib/modules/x86_64/updates? Nope. That should have been KERNELVER.

So yeah, replace the third change with this and that's a big ACK. And
thanks!

-w


More information about the anaconda-patches mailing list