- update

Changed files:
    EMCpower-init.patch -> 1.8

diff --git a/EMCpower-init.patch b/EMCpower-init.patch
index 0086b8764d53a4ea276c155a28046ee72964c84f..66003945e1c79289dc0f0b7d5479793260c04017 100644 (file)
--- a/EMCpower-init.patch
+++ b/EMCpower-init.patch
@@ -1,5 +1,5 @@
---- EMCpower-5.0.0/PowerPath.rhel      2007-02-07 10:06:21.000000000 +0200
-+++ EMCpower-5.0.0/PowerPath   2007-05-29 15:39:50.764904063 +0300
+--- EMCpower-5.0.0/PowerPath.rhel    2007-02-07 10:06:21.000000000 +0200
++++ EMCpower-5.0.0/PowerPath    2007-05-29 15:39:50.764904063 +0300
 @@ -15,6 +15,9 @@
  
  # @(#) $Header$
@@ -15,16 +15,19 @@
          case "$rc_script_stat" in
              0)
 -              echo "`eval_gettext \" done\"`"
-+                        nls " done"
++              ok
                ;;
              *)
 -              echo "`eval_gettext \" failed\"`"
-+                        nls " failed"
++              fail
                ;;
          esac
      fi
-@@ -71,29 +74,11 @@
- PPBASE=/etc/opt/emcpower/EMCpower.LINUX-5.0.0
+@@ -68,32 +71,13 @@
+ # @(#) $Header$
+ 
+ PATH=/usr/bin/:/bin:/sbin:/usr/sbin
+-PPBASE=/etc/opt/emcpower/EMCpower.LINUX-5.0.0
  
  # the following are the internationalization specific lines
 -
@@ -53,7 +56,7 @@
  pp_stop_lvm()
  {
      if test -x /sbin/vgchange -a -x /sbin/vgscan ; then
-@@ -106,19 +91,19 @@
+@@ -106,19 +90,19 @@
                          err_stop=`/sbin/vgchange -a n $i  2>&1 | grep "open logical volume"`
                          if [ "$err_stop" != "" ]; then
                                  if [ "$open_vol" = "" ]; then
@@ -77,7 +80,7 @@
        return 1
          fi
   return 0
-@@ -154,9 +139,9 @@
+@@ -154,9 +138,9 @@
      rc_check
  
      if rc_status ; then
@@ -89,7 +92,7 @@
      fi
  }
  
-@@ -166,7 +151,7 @@
+@@ -166,7 +150,7 @@
  {
      if [ -f /etc/emcp_devicesDB.dat ]; then 
          if [ -f /etc/emcp_devicesDB.idx ]; then
@@ -98,7 +101,7 @@
              rc_check
          fi
      fi
-@@ -206,9 +191,9 @@
+@@ -206,9 +190,9 @@
  
      /sbin/powermt load                > /dev/null 2>&1
      rc_check
@@ -110,7 +113,7 @@
      /sbin/powermt save                > /dev/null 2>&1
      rc_check
      /sbin/powermt register    > /dev/null 2>&1
-@@ -224,15 +209,15 @@
+@@ -224,15 +208,15 @@
  {
      ps -C naviagent >> /dev/null
      if [ $? -eq 0 ]; then
@@ -130,18 +133,18 @@
          return 1
      fi
  
-@@ -240,8 +225,8 @@
+@@ -240,8 +224,8 @@
      if [ $? -eq 0 ]; then
          echo "$mig_info" | grep 'No migrations found' > /dev/null
          if test $? -ne 0 ; then 
 -            echo "`eval_gettext \"PowerPath migrations are present.\"`"
 -            echo "`eval_gettext \"Please cleanup the migrations and then re-issue \\$script_name stop.\"`"
 +                      nls "PowerPath migrations are present."
-+                      eval echo "$(nls "Please cleanup the migrations and then re-issue \\$script_name stop.\")"
++                      eval echo "$(nls "Please cleanup the migrations and then re-issue \\$script_name stop.")"
              return 1
          fi
      fi
-@@ -261,7 +246,7 @@
+@@ -261,7 +245,7 @@
          /sbin/modprobe -q -s --first-time $d
          rc_check
          if [ $? -ne 0 ] ; then
@@ -150,7 +153,7 @@
              break
          fi
      done
-@@ -318,8 +303,8 @@
+@@ -318,8 +302,8 @@
           else
            sleep 5
            retry=`expr $retry - 1`
@@ -161,7 +164,7 @@
              #/bin/false
            #uerr=$?
              #return $uerr
-@@ -334,14 +319,14 @@
+@@ -334,14 +318,14 @@
         uerr=$?
         return $uerr
      else
@@ -179,7 +182,7 @@
      uerr=1
      return $uerr
  }
-@@ -358,7 +343,7 @@
+@@ -358,20 +342,19 @@
      mknod /dev/emcpower c $mmaj $mmin > /dev/null
  
      if [ $? -ne 0 ]; then
@@ -188,39 +191,71 @@
      fi
  
  }
-@@ -371,7 +356,7 @@
+ 
+ rc_reset
+ script_name=PowerPath
+-ext=$PPBASE/bin/.drivers_ext
+-mgr=$PPBASE/bin/.drivers_mgr
++ext=/etc/emc/.drivers_ext
++mgr=/etc/emc/.drivers_mgr
+ 
  case "$1" in
      start)
- 
+-
 -        echo -n "`eval_gettext \"Starting \\$script_name: \"`"
-+        eval echo -n "$(nls "Starting \$script_name: ")"
++        msg_starting "PowerPath"
  
          ###
          # Start the 32-bit emulation for ia64
-@@ -411,7 +396,7 @@
+@@ -387,7 +370,7 @@
+             lsmod | grep -w '^emcp' > /dev/null
+             if [ $? -ne 0 ]; then
+                 load_drivers
+-          else
++        else
+                 if dev_emcpower_is_back 60; then
+                     recreate_emcpower_device
+                     /etc/opt/emcpower/powercf -K        > /dev/null 2>&1
+@@ -396,10 +379,10 @@
+                     rc_check
+                     unload_drivers
+                 fi
+-              # remove PIOC if it was loaded during RD boot.
+-              lsmod | grep emcpioc > /dev/null
+-              if [ $? -eq 0 ]; then
+-                  /sbin/rmmod emcpioc > /dev/null
++            # remove PIOC if it was loaded during RD boot.
++                lsmod | grep emcpioc > /dev/null
++            if [ $? -eq 0 ]; then
++                /sbin/rmmod emcpioc > /dev/null
+                 fi
+             fi
+ 
+@@ -411,7 +394,7 @@
                      unload_drivers
                  fi
              else
 -                echo "`eval_gettext \"PowerPath: unable to load PowerPath modules.\"`"
-+                              nls "PowerPath: unable to load PowerPath modules."
++                nls "PowerPath: unable to load PowerPath modules."
                  unload_drivers
              fi
          fi
-@@ -419,11 +404,11 @@
+@@ -419,11 +402,10 @@
          ;;
  
      stop)
 -        echo -n "`eval_gettext \"Stopping \\$script_name: \"`"
-+        eval echo -n "$(nls "Stopping \$script_name: ")"
++        msg_stopping "PowerPath"
          lsmod | grep -w '^emcp' > /dev/null
-         if test $? -ne 0 ;
-         then
+-        if test $? -ne 0 ;
+-        then
 -                echo "`eval_gettext \"PowerPath is not running\"`"
-+                              nls "PowerPath is not running"
++        if test $? -ne 0; then
++            nls "PowerPath is not running"
          else
              #
              # Tresspass can happen if new devices are added or some devices 
-@@ -436,7 +421,7 @@
+@@ -436,7 +418,7 @@
              if ok_to_stop; then
                  /sbin/powermt save > /dev/null 2>&1
                  rc_check
@@ -229,7 +264,7 @@
                  rc_check
                  /sbin/powermt remove dev=all 2> /var/tmp/.pp_exit
                  devr=$?
-@@ -451,18 +436,18 @@
+@@ -451,21 +433,21 @@
                      unload_drivers
                      rc_check
                      if [ $? -ne 0 ] ; then
@@ -247,17 +282,24 @@
                      else
 -                        echo "`eval_gettext \"PowerPath devices are open.\"`"
 -                        echo "`eval_gettext \"Please close these devices and then re-issue \\$script_name stop.\"`"
+-                        /etc/opt/emcpower/emcpmgr map -p > /dev/null 2>&1
 +                        nls "PowerPath devices are open."
 +                        eval echo "$(nls "Please close these devices and then re-issue \$script_name stop.")"
-                         /etc/opt/emcpower/emcpmgr map -p > /dev/null 2>&1
++                        /sbin/emcpmgr map -p > /dev/null 2>&1
                          /sbin/powermt config  > /dev/null 2>&1
-                       /sbin/powermt load      > /dev/null 2>&1
-@@ -477,8 +462,9 @@
+-                      /sbin/powermt load      > /dev/null 2>&1
++                                              /sbin/powermt load      > /dev/null 2>&1
+                         /bin/false
+                     fi
+                 fi
+@@ -476,9 +458,10 @@
+         rc_status -v
          ;;
      *)
-         var=$0
+-        var=$0
 -      echo "`eval_gettext \"Usage: \\$var {start|stop}\"`"
-+              eval echo "$(nls "Usage: \$var {start\|stop}")"
++        msg_usage "$0 {start|stop}"
++        exit 3
        ;;
  esac