From 30f04e5f7e9b4b77995836c362e57d0b25bde25f Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Thu, 4 May 2006 06:23:11 +0000 Subject: Improved autodetect functionality with a checked_modules function git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@53 880c04e9-e011-0410-abf7-b926e227c9cd --- functions | 49 ++++++++++++++++++++++++++++++++++++------------- install/autodetect | 50 ++++++++++++++++++-------------------------------- install/filesystems | 2 +- install/ide | 2 +- install/sata | 2 +- install/scsi | 6 +++--- install/usb | 2 +- mkinitcpio | 3 +++ mkinitcpio.conf | 4 ++-- 9 files changed, 66 insertions(+), 54 deletions(-) diff --git a/functions b/functions index ac3d5a7..8396999 100644 --- a/functions +++ b/functions @@ -2,19 +2,42 @@ auto_modules () { aliases=$(find /sys/devices/ -name modalias -exec cat {} \;) - modprobe --set-version ${KERNELVERSION} --show-depends -a \ - $aliases 2>/dev/null | sed "s|insmod \(.*\)|\1|" |\ - grep ${@} | sort -u + mods=$(modprobe --set-version ${KERNELVERSION} --show-depends -a \ + $aliases 2>/dev/null | sed 's|insmod \(.*\)|\1|' | grep ${@} | sort -u) + + echo "${mods}" + [ "x${mods}" = "x" ] && return 1 + return 0 } all_modules () { - find ${MODULEDIR} -name *.ko 2>/dev/null |\ - grep ${@} | sort -u + mods=$(find ${MODULEDIR} -name *.ko 2>/dev/null | grep ${@} | sort -u) + + echo "${mods}" + [ "x${mods}" = "x" ] && return 1 + return 0 +} + +checked_modules () +{ + ret=1 + if [ -e "${MODULE_FILE}" ]; then + for mod in $(all_modules ${@}); do + if grep "$(basename ${mod%%\.ko})" "${MODULE_FILE}" >/dev/null 2>&1; then + ret=0 + echo ${mod} + fi + done + return $ret + else + all_modules ${@} + fi } msg () { [ "${QUIET}" = "n" ] && echo "${@}"; } err () { echo "ERROR: ${@}" >&2; } +die () { echo "FATAL: ${@}" >&2; exit 1; } add_dir () { @@ -35,7 +58,7 @@ add_device () local perms perms="${5:-644}" if ! grep "nod ${1}" "${FILELIST}" 2>&1 > /dev/null; then - add_dir $(dirname "${1}") + add_dir $(dirname "${1}") msg " adding node ${1}" echo "nod ${1} ${perms} 0 0 ${2} ${3} ${4}" >> "${FILELIST}" fi @@ -53,11 +76,11 @@ add_symlink () dest="${2##$BASEDIR}" add_dir $(dirname "${dest}") if ! grep "slink ${dest} " "${FILELIST}" 2>&1 > /dev/null; then - msg " adding link ${fil} -> ${dest}" + msg " adding link ${fil} -> ${dest}" echo "slink ${dest} ${fil} $(stat -c '%a %u %g' ${fil})" >> "${FILELIST}" fi fi - #fail quietly + #fail quietly } add_file () @@ -109,7 +132,7 @@ add_module () _finish_modules () { - echo "wtf!" + echo "wtf!" } @@ -175,8 +198,8 @@ parse_hook () fi done - if [ "x${SCRIPT}" != "x" ]; then - add_file "${HOOKDIR}/${SCRIPT}" "/hooks/${SCRIPT}" - fi + if [ "x${SCRIPT}" != "x" ]; then + add_file "${HOOKDIR}/${SCRIPT}" "/hooks/${SCRIPT}" + fi } -# vim: set ft=sh ts=4 sw=4 noet: +# vim: set ft=sh ts=4 sw=4 et: diff --git a/install/autodetect b/install/autodetect index 70dc779..6371d35 100644 --- a/install/autodetect +++ b/install/autodetect @@ -3,10 +3,9 @@ install () { msg ":: Autodetecting modules" + MODULE_FILE="$(mktemp /tmp/initcpio_modules.XXXXXX)" #blegh, we'll let /tmp clean itself up - modtmp=$( mktemp /tmp/initcpio_modules.XXXXXX ) - modall=$( mktemp /tmp/initcpio_modulesall.XXXXXX ) - AUTODETECT=" $(auto_modules "/scsi/" | grep -v "imm"| grep -v "pcmcia" | grep -v "ide" && echo "sd_mod sr_mod") + AUTODETECT=" $((auto_modules "/scsi/" | grep -ve "imm" -e "pcmcia" -e "ide") && echo "sd_mod sr_mod") $(auto_modules "/block/" && echo "sd_mod sr_mod") $(auto_modules "/fusion/" && echo "sd_mod sr_mod") $(auto_modules "/usb/" && echo "usb_storage usbhid sd_mod sr_mod") @@ -14,33 +13,21 @@ install () $(auto_modules "/ieee1394/" && echo "sbp2 sd_mod sr_mod") $(auto_modules "/cdrom/") $(cat /proc/filesystems | grep -v nodev) " - + for m in $AUTODETECT; do - echo $(basename ${m//\.ko/}) >> $modtmp + modname="$(basename ${m%%\.ko})" + grep "${modname}" "${MODULE_FILE}" >/dev/null 2>&1 && continue + echo "${modname}" >> "${MODULE_FILE}" # fixing missing depends for filesystems - [ "$m" == "ext3" ] && echo "jbd" >> $modtmp - [ "$m" == "afs" ] && echo "rxrpc" >> $modtmp - [ "$m" == "cramfs" ] && echo "zlib_inflate" >> $modtmp - [ "$m" == "isofs" ] && echo "zlib_inflate" >> $modtmp - [ "$m" == "msdos" ] && echo "fat" >> $modtmp - [ "$m" == "vfat" ] && echo "fat" >> $modtmp - [ "$m" == "ocfs2" ] && echo "ocfs2_dlm" >> $modtmp - [ "$m" == "ocfs2" ] && echo "jbd" >> $modtmp - [ "$m" == "ocfs2" ] && echo "ocfs2_nodemanager" >> $modtmp - [ "$m" == "ocfs2" ] && echo "configfs" >> $modtmp + [ "$m" = "ext3" ] && echo "jbd" >> "${MODULE_FILE}" + [ "$m" = "afs" ] && echo "rxrpc" >> "${MODULE_FILE}" + [ "$m" = "cramfs" ] && echo "zlib_inflate" >> "${MODULE_FILE}" + [ "$m" = "isofs" ] && echo "zlib_inflate" >> "${MODULE_FILE}" + [ "$m" = "msdos" ] && echo "fat" >> "${MODULE_FILE}" + [ "$m" = "vfat" ] && echo "fat" >> "${MODULE_FILE}" + [ "$m" = "ocfs2" ] && echo -e "ocfs2_dlm\njbd\nocfs2_nodemanager\nconfigfs" >> "${MODULE_FILE}" done - grep "file /lib/modules" ${FILELIST} >>$modall - for i in `cat $modtmp`; do - sed -i -e "\=/$i=d" $modall - done - for i in `grep "file /lib/modules" $modall | awk '{print $2}'`; do - sed -i -e "\=$i=d" ${FILELIST} - done - msg "Included MODULES:" - msg "-----------------" - msg "$(grep "file /lib/modules/" ${FILELIST} | awk '{print $2}')" - msg "-----------------" BINARIES="" FILES="" SCRIPT="" @@ -50,11 +37,10 @@ help () { cat <