Make sure, the same modules are installed as before.
if (!check_module_path(path) || !check_module_symbols(mod)) {
log_debug("No symbol or patch match for '%s'", path);
return 0;
+ //return -ENOENT;
}
log_debug("dracut_install '%s'", path);
}
kmod_list_foreach(itr, modlist) {
mod = kmod_module_get_module(itr);
- ret = install_module(mod);
+ ret += install_module(mod);
}
kmod_module_unref_list(modlist);
modlist = 0;
}
kmod_list_foreach(itr, modlist) {
mod = kmod_module_get_module(itr);
- ret = install_module(mod);
+ ret += install_module(mod);
kmod_module_unref(mod);
}
kmod_module_unref_list(modlist);
modlist = 0;
#else
- ret = install_module(mod_o);
+ ret += install_module(mod_o);
kmod_module_unref(mod_o);
#endif
}
kmod_list_foreach(itr, modlist) {
mod = kmod_module_get_module(itr);
- ret = install_module(mod);
+ ret += install_module(mod);
kmod_module_unref(mod);
}
kmod_module_unref_list(modlist);
if [[ $hostonly ]]; then
for i in /sys/bus/{pci/devices,soc/devices/soc?}/*/modalias; do
[[ -e $i ]] || continue
- if hostonly="" dracut_instmods -s "drm_crtc_init" $(<$i) 2>/dev/null; then
- if strstr $(modinfo -F filename $(<$i) 2>/dev/null) radeon.ko; then
+ if hostonly="" dracut_instmods -s "drm_crtc_init" -S "iw_handler_get_spy" $(<$i) 2>/dev/null; then
+ if strstr "$(modinfo -F filename $(<$i) 2>/dev/null)" radeon.ko; then
hostonly='' instmods amdkfd
fi
fi
if [[ -z $drivers ]]; then
hostonly='' instmods \
sr_mod sd_mod scsi_dh ata_piix hid_generic unix \
- ehci-hcd ehci-pci \
+ ehci-hcd ehci-pci ehci-platform \
ohci-hcd ohci-pci \
uhci-hcd \
xhci-hcd xhci-pci xhci-plat-hcd \
- ehci-platform
-
- instmods \
"=drivers/hid" \
"=drivers/input/serio" \
"=drivers/input/keyboard" \
+ "=drivers/usb/storage" \
+ ${NULL}
+
+ instmods \
yenta_socket scsi_dh_rdac scsi_dh_emc scsi_dh_alua \
atkbd i8042 usbhid firewire-ohci pcmcia hv-vmbus \
virtio virtio_blk virtio_ring virtio_pci virtio_scsi \
- "=drivers/pcmcia" =ide "=drivers/usb/storage"
+ "=drivers/pcmcia" =ide
if [[ "$(uname -p)" == arm* ]]; then
# arm specific modules
${NULL}
fi
- dracut_instmods -s "${_blockfuncs}" "=drivers"
+ dracut_instmods -o -s "${_blockfuncs}" "=drivers"
# if not on hostonly mode, install all known filesystems,
# if the required list is not set via the filesystems variable
if ! [[ $hostonly ]]; then
if [[ -z $filesystems ]]; then
- dracut_instmods -P ".*/(kernel/fs/nfs|kernel/fs/nfsd|kernel/fs/lockd)/.*" '=fs'
+ dracut_instmods -o -P ".*/(kernel/fs/nfs|kernel/fs/nfsd|kernel/fs/lockd)/.*" '=fs'
fi
else
hostonly='' instmods "${host_fs_types[@]}"
_s390drivers="=drivers/s390/net"
fi
- dracut_instmods -P ".*${_unwanted_drivers}.*" -s "$_net_drivers" "=drivers/net" ${_s390drivers:+"$_s390drivers"}
+ dracut_instmods -o -P ".*${_unwanted_drivers}.*" -s "$_net_drivers" "=drivers/net" ${_s390drivers:+"$_s390drivers"}
#instmods() will take care of hostonly
instmods \
_s390drivers="=drivers/s390/scsi"
fi
- hostonly='' dracut_instmods -s "$_funcs" "=drivers/scsi" "=drivers/md" ${_s390drivers:+"$_s390drivers"}
+ hostonly='' dracut_instmods -o -s "$_funcs" "=drivers/scsi" "=drivers/md" ${_s390drivers:+"$_s390drivers"}
}
# called by dracut
_s390drivers="=drivers/s390/scsi"
fi
- dracut_instmods -s "$_funcs" "=drivers/scsi" ${_s390drivers:+"$_s390drivers"}
+ dracut_instmods -o -s "$_funcs" "=drivers/scsi" ${_s390drivers:+"$_s390drivers"}
}