diff --git a/defaults/linuxrc b/defaults/linuxrc index ed40cb3..3f570de 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -253,13 +253,6 @@ do aufs) USE_AUFS_NORMAL=1 ;; - *=*) - case "${x%%=*}" in - *.*) - echo "${x#*.}" >> "/etc/module_options/${x%%.*}.conf" - ;; - esac - ;; esac done diff --git a/gen_initramfs.sh b/gen_initramfs.sh index dd0fccb..5337762 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -569,41 +569,6 @@ append_modules() { rm -r "${TEMP}/initramfs-modules-${KV}-temp/" } -append_modprobed() { - local TDIR="${TEMP}/initramfs-modprobe.d-temp" - if [ -d "${TDIR}" ] - then - rm -r "${TDIR}" - fi - - mkdir -p "${TDIR}/etc/module_options/" - - # Load module parameters - for dir in $(find "${MODPROBEDIR}"/*) - do - while read x - do - case "${x}" in - options*) - module_name="$(echo "$x" | cut -d ' ' -f 2)" - [ "${module_name}" != "$(echo)" ] || continue - module_options="$(echo "$x" | cut -d ' ' -f 3-)" - [ "${module_options}" != "$(echo)" ] || continue - echo "${module_options}" >> "${TDIR}/etc/module_options/${module_name}.conf" - ;; - esac - done < "${dir}" - done - - cd "${TDIR}" - log_future_cpio_content - find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ - || gen_die "compressing modprobe.d cpio" - - cd "${TEMP}" - rm -rf "${TDIR}" > /dev/null -} - # check for static linked file with objdump is_static() { LANG="C" LC_ALL="C" objdump -T $1 2>&1 | grep "not a dynamic object" > /dev/null @@ -749,8 +714,6 @@ create_initramfs() { append_data 'splash' "${SPLASH}" - append_data 'modprobed' - if isTrue "${FIRMWARE}" && [ -n "${FIRMWARE_DIR}" ] then append_data 'firmware'