kernel-modules/module-setup.sh: move "$drivers" "$filesystems" and "$add_drivers" to dracut.sh

master
Harald Hoyer 2012-07-27 16:03:42 +02:00
parent 764eb40cc9
commit aec9f902f0
2 changed files with 14 additions and 13 deletions

View File

@ -780,9 +780,9 @@ if ! [[ -d "$systemdutildir" ]]; then
fi
[[ -d "$systemdsystemunitdir" ]] || systemdsystemunitdir=${systemdutildir}/system

export initdir dracutbasedir dracutmodules drivers \
export initdir dracutbasedir dracutmodules \
fw_dir drivers_dir debug no_kernel kernel_only \
add_drivers omit_drivers mdadmconf lvmconf filesystems \
omit_drivers mdadmconf lvmconf \
use_fstab fstab_lines libdirs fscks nofscks ro_mnt \
stdloglvl sysloglvl fileloglvl kmsgloglvl logfile \
debug host_fs_types host_devs sshkey add_fstab \
@ -898,6 +898,18 @@ dinfo "*** Including modules done ***"

## final stuff that has to happen
if [[ $no_kernel != yes ]]; then

if [[ $drivers ]]; then
hostonly='' instmods $drivers
fi

if [[ $add_drivers ]]; then
hostonly='' instmods -c $add_drivers
fi
if [[ $filesystems ]]; then
hostonly='' instmods -c $filesystems
fi

dinfo "*** Installing kernel module dependencies and firmware ***"
dracut_kernel_post
dinfo "*** Installing kernel module dependencies and firmware done ***"

View File

@ -61,17 +61,6 @@ installkernel() {
}
for_each_host_dev_fs inst_fs
fi
else
hostonly='' instmods $drivers
fi

if [[ $add_drivers ]]; then
hostonly='' instmods -c $add_drivers || return 1
fi
if [[ $filesystems ]]; then
hostonly='' instmods -c $filesystems || return 1
fi

}

install() {