Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mkinitrd-magellan/mkinitrd.in

    Diff of /trunk/mkinitrd-magellan/mkinitrd.in

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 1218 by niro, Thu Dec 16 01:24:51 2010 UTC revision 1219 by niro, Sat Jan 29 14:04:00 2011 UTC
    # Line 94  moduledep() Line 94  moduledep()
    94    
    95   echo "Looking for deps of module $1"   echo "Looking for deps of module $1"
    96   deps=$(awk 'BEGIN { searched=ARGV[2]; ARGV[2]=""; rc=1 } \   deps=$(awk 'BEGIN { searched=ARGV[2]; ARGV[2]=""; rc=1 } \
    97   function modname(filename) { match(filename, /\/([^\/]+)\.k?o:?$/, ret); return ret[1] } \   function modname(filename) { match(filename, /\/([^\/]+)\.k?o.?g?z?:?$/, ret); return ret[1] } \
    98   function show() { if (orig == searched) { print dep; orig=""; rc=0; exit } } \   function show() { if (orig == searched) { print dep; orig=""; rc=0; exit } } \
    99   /^.*kernel/ { show(); \   /^.*kernel/ { show(); \
    100   orig=modname($1); dep=""; \   orig=modname($1); dep=""; \
    # Line 132  findmodule() Line 132  findmodule()
    132    
    133   case "${MODULES} " in   case "${MODULES} " in
    134   *"/${modName}.ko "*) return ;;   *"/${modName}.ko "*) return ;;
    135     *"/${modName}.ko.gz "*) return ;;
    136   esac   esac
    137    
    138   if echo ${builtins} | egrep -q '(^| )'${modName}'( |$)'   if echo ${builtins} | egrep -q '(^| )'${modName}'( |$)'
    # Line 164  findmodule() Line 165  findmodule()
    165   done   done
    166   fi   fi
    167    
    168   for modExt in o.gz o ko   for modExt in o.gz o ko ko.gz
    169   do   do
    170   for modDir in /lib/modules/${kernel}/updates /lib/modules/${kernel}   for modDir in /lib/modules/${kernel}/updates /lib/modules/${kernel}
    171   do   do
    # Line 252  findstoragedriver() Line 253  findstoragedriver()
    253   modalias=$(cat modalias)   modalias=$(cat modalias)
    254   for driver in $(modprobe --set-version ${kernel} --show-depends ${modalias} 2>/dev/null| awk '{ print gensub(".*/","","g",$2) }')   for driver in $(modprobe --set-version ${kernel} --show-depends ${modalias} 2>/dev/null| awk '{ print gensub(".*/","","g",$2) }')
    255   do   do
    256   findmodule ${driver%%.ko}   findmodule ${driver%%.*}
    257   done   done
    258   popd >/dev/null 2>&1   popd >/dev/null 2>&1
    259   done   done
    # Line 773  add_initrd 'echo /sbin/mdev > /proc/sys/ Line 774  add_initrd 'echo /sbin/mdev > /proc/sys/
    774  for MODULE in ${MODULES}  for MODULE in ${MODULES}
    775  do  do
    776   text=""   text=""
    777   module=$(echo ${MODULE} | sed "s|.*/||" | sed "s/.k\?o$//")   module=$(echo ${MODULE} | sed "s|.*/||" | sed -e "s/.k\?o.\?g\?z\?$//" -e "s/.gz//")
    778   fullmodule=$(echo ${MODULE} | sed "s|.*/||")   fullmodule=$(echo ${MODULE} | sed -e "s|.*/||" -e "s/.gz//")
    779    
    780   options=$(sed -n -e "s/^options[     ][      ]*${module}[      ][      ]*//p" ${modprobeconf} 2>/dev/null)   options=$(sed -n -e "s/^options[     ][      ]*${module}[      ][      ]*//p" ${modprobeconf} 2>/dev/null)
    781    
    # Line 893  do Line 894  do
    894   if [ -x /usr/bin/strip ] && [[ ${NOSTRIP} = false ]]   if [ -x /usr/bin/strip ] && [[ ${NOSTRIP} = false ]]
    895   then   then
    896   /usr/bin/strip -g ${verbose} ${MODULE} -o ${DEST}/lib/$(basename ${MODULE}) || die   /usr/bin/strip -g ${verbose} ${MODULE} -o ${DEST}/lib/$(basename ${MODULE}) || die
    897     # handle gzip compressed modules right
    898     elif [[ ${MODULE##*.} = gz ]]
    899     then
    900     zcat ${verbose} ${MODULE} > ${DEST}/lib/$(basename ${MODULE} .gz) || die
    901   else   else
    902   cp ${verbose} -a ${MODULE} ${DEST}/lib || die   cp ${verbose} -a ${MODULE} ${DEST}/lib || die
    903   fi   fi
    Legend:
    Removed from v.1218  
    changed lines
      Added in v.1219