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 1140 by niro, Thu Aug 19 12:24:23 2010 UTC revision 1219 by niro, Sat Jan 29 14:04:00 2011 UTC
    # Line 44  NOSTRIP=false Line 44  NOSTRIP=false
    44    
    45  CONFMODS="${MODULES}"  CONFMODS="${MODULES}"
    46  MODULES=""  MODULES=""
    47    INITEXEC="/sbin/init"
    48    
    49  compress=1  compress=1
    50  allowmissing=""  allowmissing=""
    # Line 76  usage() Line 77  usage()
    77   echo "       [--image-version] [--force-scsi-probe | --omit-raid-modules]"   echo "       [--image-version] [--force-scsi-probe | --omit-raid-modules]"
    78   echo "       [--with=<module>] [--force-lvm-probe | --omit-lvm-modules]"   echo "       [--with=<module>] [--force-lvm-probe | --omit-lvm-modules]"
    79   echo "       [--builtin=<module>] [--initramfs | --loopback] [--no-strip]"   echo "       [--builtin=<module>] [--initramfs | --loopback] [--no-strip]"
    80   echo "       [--fstab=<fstab>] [--nocompress] <initrd-image> <kernel-version>"   echo "       [--fstab=<fstab>] [--nocompress] [--initexec=<init>]"
    81     echo "       <initrd-image> <kernel-version>"
    82   echo   echo
    83   echo "       (ex: $(basename $0) /boot/initrd-2.2.5-15.img 2.2.5-15)"   echo "       (ex: $(basename $0) /boot/initrd-2.2.5-15.img 2.2.5-15)"
    84    
    # Line 92  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 130  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 162  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 250  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 415  while [ $# -gt 0 ]; do Line 418  while [ $# -gt 0 ]; do
    418   --initramfs) IMAGE_TYPE=initramfs ;;   --initramfs) IMAGE_TYPE=initramfs ;;
    419   --loopback) IMAGE_TYPE=loopback ;;   --loopback) IMAGE_TYPE=loopback ;;
    420   --no-strip) NOSTRIP=true ;;   --no-strip) NOSTRIP=true ;;
    421     --initexec*)
    422     if echo $1 | grep -q '=' ; then
    423     INITEXEC=$(echo $1 | sed 's/^--initexec=//')
    424     else
    425     INITEXEC=$2
    426     shift
    427     fi
    428     ;;
    429   *)   *)
    430   if [ -z "${target}" ]   if [ -z "${target}" ]
    431   then   then
    # Line 763  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 836  then Line 847  then
    847   done   done
    848  fi  fi
    849    
    850    # get the right initexec
    851    add_initrd "INITEXEC=\"${INITEXEC}\""
    852    # support init=* from cmdline
    853    add_initrd 'for i in $(cat /proc/cmdline); do if [[ ${i} = init=* ]]; then INITEXEC=${i/init=}; fi; done'
    854    
    855  add_initrd 'echo "-- Mounting sysroot ..."'  add_initrd 'echo "-- Mounting sysroot ..."'
    856  add_initrd '. /etc/rootdev'  add_initrd '. /etc/rootdev'
    857  add_initrd 'echo "${device} /sysroot ${rootfs} defaults,ro 0 0" > /etc/fstab'  add_initrd 'echo "${device} /sysroot ${rootfs} defaults,ro 0 0" > /etc/fstab'
    # Line 847  add_initrd 'echo > /proc/sys/kernel/hotp Line 863  add_initrd 'echo > /proc/sys/kernel/hotp
    863  # de-silencio  # de-silencio
    864  add_initrd 'echo 3 > /proc/sys/kernel/printk'  add_initrd 'echo 3 > /proc/sys/kernel/printk'
    865    
    866    add_initrd 'BREAK_ENABLED=no'
    867    add_initrd 'for i in $(cat /proc/cmdline); do if [[ ${i} = break ]]; then BREAK_ENABLED=yes; fi; done'
    868    add_initrd 'if [[ ${BREAK_ENABLED} = yes ]]; then echo "-- Break requested, type 'exit' to resume operation ..."; ash; fi'
    869    
    870  add_initrd 'echo "-- Switching to real sysroot ..."'  add_initrd 'echo "-- Switching to real sysroot ..."'
    871  add_initrd 'umount /dev'  add_initrd 'umount /dev'
    872  add_initrd 'umount /sys'  add_initrd 'umount /sys'
    873  add_initrd 'umount /proc'  add_initrd 'umount /proc'
    874    
    875  [[ ${IMAGE_TYPE} = initramfs ]] && add_initrd 'exec run-init /sysroot /sbin/init $@ </sysroot/dev/console >/sysroot/dev/console'  [[ ${IMAGE_TYPE} = initramfs ]] && add_initrd 'exec run-init /sysroot ${INITEXEC} $@ </sysroot/dev/console >/sysroot/dev/console'
    876  if [[ ${IMAGE_TYPE} = loopback ]]  if [[ ${IMAGE_TYPE} = loopback ]]
    877  then  then
    878   add_initrd 'cd /sysroot'   add_initrd 'cd /sysroot'
    879   add_initrd 'pivot_root . initrd'   add_initrd 'pivot_root . initrd'
    880   add_initrd "exec /sbin/chroot . sh -c 'umount -n /initrd >/dev/null 2>&1;exec -a init.new /sbin/init'</dev/console >/dev/console 2>&1"   add_initrd "exec /sbin/chroot . sh -c 'umount -n /initrd >/dev/null 2>&1;exec -a init.new \${INITEXEC}'</dev/console >/dev/console 2>&1"
    881  fi  fi
    882    
    883  chmod +x ${DEST}/init || die  chmod +x ${DEST}/init || die
    # Line 874  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.1140  
    changed lines
      Added in v.1219