[SSI] openssi/distro-pkgs/redhat/mkinitrd mkinitrd,1.1.3.1.2.9,1.1.3.1.2.10

Update of /cvsroot/ssic-linux/openssi/distro-pkgs/redhat/mkinitrd
In directory sc8-pr-cvs1:/tmp/cvs-serv28186

Modified Files:
      Tag: OPENSSI-RH
        mkinitrd 
Log Message:
M openssi/distro-pkgs/redhat/mkinitrd/mkinitrd
        Added "--modulefile" option to allow an alternate modules.conf
        to be specified. Got rid of hard-coded /etc/modules.conf found
        by Ron Croonenberg.


Index: mkinitrd
===================================================================
RCS file: 
/cvsroot/ssic-linux/openssi/distro-pkgs/redhat/mkinitrd/Attic/mkinitrd,v
retrieving revision 1.1.3.1.2.9
retrieving revision 1.1.3.1.2.10
diff -C2 -d -r1.1.3.1.2.9 -r1.1.3.1.2.10
*** mkinitrd    16 Oct 2003 02:46:47 -0000      1.1.3.1.2.9
--- mkinitrd    31 Oct 2003 20:32:53 -0000      1.1.3.1.2.10
***************
*** 63,67 ****
      echo "       [--builtin=<module>] [--nopivot | --gfs | --cfs]" >&2
      echo "       [--dhcpd.proto=<dhcpd.proto>] [--dhcpd.conf=<dhcpd.conf>]" 
>&2
!     echo "       [--clustertab=<clustertab>] <initrd-image> <kernel-version>" 
>&2
      echo "" >&2
      echo "       (ex: `basename $0` /boot/initrd-2.2.5-15.img 2.2.5-15)" >&2
--- 63,68 ----
      echo "       [--builtin=<module>] [--nopivot | --gfs | --cfs]" >&2
      echo "       [--dhcpd.proto=<dhcpd.proto>] [--dhcpd.conf=<dhcpd.conf>]" 
>&2
!     echo "       [--clustertab=<clustertab>] [--modulefile=<modules.conf>]" 
>&2
!     echo "       <initrd-image> <kernel-version>" >&2
      echo "" >&2
      echo "       (ex: `basename $0` /boot/initrd-2.2.5-15.img 2.2.5-15)" >&2
***************
*** 357,360 ****
--- 358,373 ----
            fi
            ;;
+       --modulefile*)
+           if echo $1 | grep -q '='; then
+               modulefile=`echo $1 | sed 's/^--modulefile=//'`
+           else
+               modulefile=$2
+               shift
+           fi
+           if [ ! -f "$modulefile" ]; then
+               echo "modulefile $modulefile does not exist" >&2
+               exit 1
+           fi
+           ;;
        --dhcpd.conf*)
            if echo $1 | grep -q '='; then
***************
*** 478,482 ****
  
  if [ -n "$needusb" -a -z "$tabonly" ]; then
!     drivers=$(awk '/^alias usb-controller[0-9]* / { print $3}' < 
/etc/modules.conf)
      if [ -n "$drivers" ]; then
        findmodule usbcore
--- 491,495 ----
  
  if [ -n "$needusb" -a -z "$tabonly" ]; then
!     drivers=$(awk '/^alias usb-controller[0-9]* / { print $3 }' < $modulefile)
      if [ -n "$drivers" ]; then
        findmodule usbcore
***************
*** 570,578 ****
  fi
  
! # grab network modules from /etc/modules.conf
  if [ -n "$ssi_boot" ]; then
      findmodule -mii   # required by many network drivers
      findmodule -8390  # required by many network drivers
!     for drv in `grep '^alias[[:space:]]\+eth' /etc/modules.conf | 
                awk '{print $NF}'`
      do
--- 583,591 ----
  fi
  
! # grab network modules from $modulefile
  if [ -n "$ssi_boot" ]; then
      findmodule -mii   # required by many network drivers
      findmodule -8390  # required by many network drivers
!     for drv in `grep '^alias[[:space:]]\+eth' $modulefile | 
                awk '{print $NF}'`
      do




-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/