Magellan Linux

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

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

revision 1219 by niro, Tue Sep 14 20:27:19 2010 UTC revision 1220 by niro, Sat Jan 29 14:04:05 2011 UTC
# Line 93  moduledep() Line 93  moduledep()
93    
94   echo "Looking for deps of module $1"   echo "Looking for deps of module $1"
95   deps=$(awk 'BEGIN { searched=ARGV[2]; ARGV[2]=""; rc=1 } \   deps=$(awk 'BEGIN { searched=ARGV[2]; ARGV[2]=""; rc=1 } \
96   function modname(filename) { match(filename, /\/([^\/]+)\.k?o:?$/, ret); return ret[1] } \   function modname(filename) { match(filename, /\/([^\/]+)\.k?o.?g?z?:?$/, ret); return ret[1] } \
97   function show() { if (orig == searched) { print dep; orig=""; rc=0; exit } } \   function show() { if (orig == searched) { print dep; orig=""; rc=0; exit } } \
98   /^.*kernel/ { show(); \   /^.*kernel/ { show(); \
99   orig=modname($1); dep=""; \   orig=modname($1); dep=""; \
# Line 131  findmodule() Line 131  findmodule()
131    
132   case "${MODULES} " in   case "${MODULES} " in
133   *"/${modName}.ko "*) return ;;   *"/${modName}.ko "*) return ;;
134     *"/${modName}.ko.gz "*) return ;;
135   esac   esac
136    
137   if echo ${builtins} | egrep -q '(^| )'${modName}'( |$)'   if echo ${builtins} | egrep -q '(^| )'${modName}'( |$)'
# Line 163  findmodule() Line 164  findmodule()
164   done   done
165   fi   fi
166    
167   for modExt in o.gz o ko   for modExt in o.gz o ko ko.gz
168   do   do
169   for modDir in /lib/modules/${kernel}/updates /lib/modules/${kernel}   for modDir in /lib/modules/${kernel}/updates /lib/modules/${kernel}
170   do   do
# Line 236  EOF Line 237  EOF
237   if [ -x /usr/bin/strip ] && [[ ${NOSTRIP} = false ]]   if [ -x /usr/bin/strip ] && [[ ${NOSTRIP} = false ]]
238   then   then
239   /usr/bin/strip -g ${verbose} ${MODULE} -o ${DEST}/lib/$(basename ${MODULE}) || die   /usr/bin/strip -g ${verbose} ${MODULE} -o ${DEST}/lib/$(basename ${MODULE}) || die
240     # handle gzip compressed modules right
241     elif [[ ${MODULE##*.} = gz ]]
242     then
243     zcat ${verbose} ${MODULE} > ${DEST}/lib/$(basename ${MODULE} .gz) || die
244     MODULE="${MODULE/.gz/}"
245   else   else
246   cp ${verbose} -a ${MODULE} ${DEST}/lib || die   cp ${verbose} -a ${MODULE} ${DEST}/lib || die
247   fi   fi
248    
249   # generate modules load file   # generate modules load file
250   echo "$(basename ${MODULE} .ko)" >> ${DEST}/etc/$(basename ${list}) || die   local modname i
251     modname="${MODULE##*/}"
252     for i in .o .ko .gz
253     do
254     modname="${modname/${i}/}"
255     done
256     echo "${modname}" >> ${DEST}/etc/$(basename ${list}) || die
257   done   done
258    
259   export ALL_MODULES="${ALL_MODULES} ${MODULES}"   export ALL_MODULES="${ALL_MODULES} ${MODULES}"

Legend:
Removed from v.1219  
changed lines
  Added in v.1220