[PATCH] Save module list after initial module load (#1050352)
Vratislav Podzimek
vpodzime at redhat.com
Thu Jan 9 06:14:38 UTC 2014
On Wed, 2014-01-08 at 14:58 -0800, Brian C. Lane wrote:
> If we save the module list early it will unload essential things like
> libata, cdrom, etc. When the modules are reloaded the driver disk
> sometimes shows up as a different disk, resulting in a loop and multiple
> copies of the driver disk in /run/install/
>
> Resolves: rhbz#1050352
> ---
> dracut/driver-updates | 1 -
> dracut/driver-updates.sh | 6 +++---
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/dracut/driver-updates b/dracut/driver-updates
> index cdcddc9..65a4ede 100755
> --- a/dracut/driver-updates
> +++ b/dracut/driver-updates
> @@ -267,7 +267,6 @@ def reload_modules():
>
> # Make a list of modules added since startup
> startup_modules = get_module_set("/tmp/dd_modules")
> - startup_modules.update(["virtio_blk", "virtio_net"])
> current_modules = get_module_set("/proc/modules")
> new_modules = current_modules.difference(startup_modules)
> log.debug("new_modules = %s" % " ".join(new_modules))
> diff --git a/dracut/driver-updates.sh b/dracut/driver-updates.sh
> index 74615fe..3765575 100755
> --- a/dracut/driver-updates.sh
> +++ b/dracut/driver-updates.sh
> @@ -2,9 +2,6 @@
> # Determine if a Driver Update Disk is present, or inst.dd passed on the cmdline
> # and launch the driver update systemd service
>
> -# save module state
> -cat /proc/modules > /tmp/dd_modules
> -
> # load all modules
> udevadm trigger
> udevadm settle
> @@ -22,6 +19,9 @@ if [ -n "$dd_args" -o $blkid_rc -eq 0 ]; then
> # kludge to let kernel spit out some extra info w/o stomping on our UI
> sleep 5
>
> + # save module state
> + cat /proc/modules > /tmp/dd_modules
> +
> echo "$dd_args" > /tmp/dd_args
> info "Starting Driver Update Disk Service on $tty"
> systemctl start driver-updates@$tty.service
Good catch, ACK.
--
Vratislav Podzimek
Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic
More information about the anaconda-patches
mailing list