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

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

Modified Files:
      Tag: OPENSSI-RH
        mkinitrd 
Log Message:
M openssi/distro-pkgs/redhat/mkinitrd/mkinitrd
        Fixed to strip "node=" from mount options to allow base initrds to
        work. Modified to allow "root=LABEL" and "root=UUID" to work. (This
        may turn out to be temporary because of Dave's work.)
M openssi/distro-pkgs/redhat/mkinitrd/nash/nash.c
        Add hooks for parsing "UUID=". (The support was mostly already in
        place, just a couple of ifs needed to be added.)
M openssi/distro-pkgs/redhat/specs/mkinitrd.spec
        Bump revision.


Index: mkinitrd
===================================================================
RCS file: 
/cvsroot/ssic-linux/openssi/distro-pkgs/redhat/mkinitrd/Attic/mkinitrd,v
retrieving revision 1.1.3.1.2.10
retrieving revision 1.1.3.1.2.11
diff -C2 -d -r1.1.3.1.2.10 -r1.1.3.1.2.11
*** mkinitrd    31 Oct 2003 20:32:53 -0000      1.1.3.1.2.10
--- mkinitrd    16 Dec 2003 02:52:56 -0000      1.1.3.1.2.11
***************
*** 628,639 ****
            exit 1
        fi
-     # OpenSSI currently requires a real device name for rootdev
-     elif [ -n "$ssi_boot" ]; then
-       rootdev=$(mount | awk '{ if ($3 == "/") { print $1; }}')
      fi
      
      rootfs=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $3; }}' $fstab)
!     rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' 
$fstab)
!     
  # in case the root filesystem is modular
      findmodule -${rootfs}
--- 628,635 ----
            exit 1
        fi
      fi
      
      rootfs=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $3; }}' $fstab)
!     rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { 
gsub("(,|^)node=[^,]*", "", $4); gsub("^,", "", $4); print $4; }}' $fstab)    
  # in case the root filesystem is modular
      findmodule -${rootfs}
***************
*** 812,815 ****
--- 808,812 ----
      inst `which rmdir` "$MNTIMAGE/bin/"
      ln -s halt $MNTIMAGE/bin/reboot
+     inst /sbin/nash "$MNTIMAGE/bin/nash"
  else
      inst /sbin/nash "$MNTIMAGE/bin/nash"
***************
*** 984,988 ****
      
  elif [ $cfs_boot = "1" ]; then
-     cpdev $rootdev
      cat >> $RCFILE <<EOF
  echo Mounting root in linuxrc
--- 981,984 ----
***************
*** 991,997 ****
  if [ \$? -ne "0" ]
  then
      # Get root device name from clustertab for specific node
      # to allow a multi-path disk to be mounted by whomever is up first.
!     cfs_mount -r $rootfs $rootdev /sysroot
  
      if [ \$? -ne "0" ]
--- 987,995 ----
  if [ \$? -ne "0" ]
  then
+     echo Creating root device
+     echo mkrootdev /dev/root | nash --quiet --force
      # Get root device name from clustertab for specific node
      # to allow a multi-path disk to be mounted by whomever is up first.
!     cfs_mount -r $rootfs /dev/root /sysroot
  
      if [ \$? -ne "0" ]




-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click