EMCpower-init.patch

   1 --- EMCpower-4.5.1/PowerPath.rhel       2006-05-31 16:22:19.000000000 +0300
   2 --- EMCpower-4.5.1/PowerPath.rhel       2006-05-31 16:22:19.000000000 +0300
   3 @@ -15,6 +15,9 @@
   4
   5  # @(#) $Header$
   6
   7 +# Source function library.
   8 +. /etc/rc.d/init.d/functions
   9 +
  10
  11  # Functions to preserve exceptional command status return values
  12
  13 @@ -39,10 +42,10 @@
  14          then
  15          case "$rc_script_stat" in
  16              0)
  17 -              echo "`eval_gettext \" done\"`"
  18 +                         nls " done"
  19                ;;
  20              *)
  21 -              echo "`eval_gettext \" failed\"`"
  22 +                         nls " failed"
  23                ;;
  24          esac
  25      fi
  26 @@ -70,28 +73,11 @@
  27  PATH=/usr/bin/:/bin:/sbin:/usr/sbin
  28
  29  # the following are the internationalization specific lines
  30 -
  31 -if [ ! -x /usr/bin/gettext ]; then
  32 -gettext()
  33 -{
  34 - echo $*
  35 -}
  36 -eval_gettext()
  37 -{
  38 - eval "echo $*"
  39 -}
  40 -
  41 -else
  42 -. gettext.sh
  43  TEXTDOMAIN=PowerPath
  44  export TEXTDOMAIN
  45 -TEXTDOMAINDIR=$RPM_INSTALL_PREFIX/etc/opt/emcpower/EMCpower.LINUX-4.5.1/i18n/catalog
  46 -export TEXTDOMAINDIR
  47  export RPM_INSTALL_PREFIX
  48 -fi
  49  # end of internationalization
  50
  51 -
  52  pp_stop_lvm()
  53  {
  54      if test -x /sbin/vgchange -a -x /sbin/vgscan ; then
  55 @@ -104,19 +90,19 @@
  56                          err_stop=`/sbin/vgchange -a n $i  2>&1 | grep "open logical volume"`
  57                          if [ "$err_stop" != "" ]; then
  58                                  if [ "$open_vol" = "" ]; then
  59 -                                        echo "`eval_gettext \"Following LVM volume groups are in use:\"`"
  60 +                                                                               nls "Following LVM volume groups are in use:"
  61                                          open_vol=$err_stop
  62                                  fi
  63                         var1=$i
  64                         var2=`echo $pv`
  65 -                        echo "`eval_gettext \"      Volume Group: \\$var1 (\\$var2)\"`"
  66 +                        echo "`nls "      Volume Group: \\$var1 (\\$var2)"`"
  67                          fi
  68                  fi
  69          done
  70      fi
  71          if [ "$open_vol" != "" ]; then
  72 -            echo "`eval_gettext \"These open logical volume devices use LUNs from Powerpath managed devices,\"`"
  73 -            echo "`eval_gettext \"Please re-issue the command after closing these volumes.\"`"
  74 +                       nls "These open logical volume devices use LUNs from Powerpath managed devices,"
  75 +                       nls "Please re-issue the command after closing these volumes."
  76         return 1
  77          fi
  78   return 0
  79 @@ -152,9 +138,9 @@
  80      rc_check
  81
  82      if rc_status ; then
  83 -        echo -e "`eval_gettext \"\nSuccessfully started 32-bit emulation library\"`"
  84 +       nls "\nSuccessfully started 32-bit emulation library"
  85      else
  86 -        echo -e "`eval_gettext \"\nError in starting 32-bit emulation library\"`"
  87 +       nls "\nError in starting 32-bit emulation library"
  88      fi
  89  }
  90
  91 @@ -164,7 +150,7 @@
  92  {
  93      if [ -f /etc/emcp_devicesDB.dat ]; then
  94          if [ -f /etc/emcp_devicesDB.idx ]; then
  95 -            /etc/opt/emcpower/emcpmgr map -p > /dev/null 2>&1
  96 +            /usr/sbin/emcpmgr map -p > /dev/null 2>&1
  97              rc_check
  98          fi
  99      fi
 100 @@ -197,9 +183,9 @@
 101
 102      /sbin/powermt load         > /dev/null 2>&1
 103      rc_check
 104 -    /etc/opt/emcpower/emcpmgr map      > /dev/null 2>&1
 105 +    /usr/sbin/emcpmgr map      > /dev/null 2>&1
 106      rc_check
 107 -    /etc/opt/emcpower/powercf -C       > /dev/null 2>&1
 108 +    /usr/sbin/powercf -C       > /dev/null 2>&1
 109      /sbin/powermt save         > /dev/null 2>&1
 110      rc_check
 111      /sbin/powermt register     > /dev/null 2>&1
 112 @@ -213,15 +199,15 @@
 113  {
 114      ps -C naviagent >> /dev/null
 115      if [ $? -eq 0 ]; then
 116 -        echo "`eval_gettext \"Navisphere agent is running.\"`"
 117 -        echo  "`eval_gettext \"Please stop the agent and then re-issue \\$script_name stop.\"`"
 118 +       nls "Navisphere agent is running."
 119 +        eval echo "$(nls \"Please stop the agent and then re-issue \\$script_name stop.\")"
 120          return 1
 121      fi
 122
 123      ps -C powermt >> /dev/null
 124      if [ $? -eq 0 ]; then
 125 -        echo "`eval_gettext \"The powermt command is running.\"`"
 126 -        echo "`eval_gettext \"Please stop powermt and then re-issue \\$script_name stop.\"`"
 127 +       nls "The powermt command is running."
 128 +        echo "`eval nls \"Please stop powermt and then re-issue \\$script_name stop.\"`"
 129          return 1
 130      fi
 131      if pp_stop_lvm ; then
 132 @@ -239,7 +225,7 @@
 133          /sbin/modprobe -q -s --first-time $d
 134          rc_check
 135          if [ $? -ne 0 ] ; then
 136 -            echo "`eval_gettext \"PowerPath could not load module \\$d\"`"
 137 +            echo "`eval nls \"PowerPath could not load module \\$d\"`"
 138              break
 139          fi
 140      done
 141 @@ -261,12 +247,12 @@
 142
 143  rc_reset
 144  script_name=PowerPath
 145 -ext=/etc/opt/emcpower/EMCpower.LINUX-4.5.1/bin/.drivers_ext
 146 +ext=/etc/emcpower/drivers_ext
 147
 148  case "$1" in
 149      start)
 150
 151 -        echo -n "`eval_gettext \"Starting \\$script_name: \"`"
 152 +        eval echo -n "$(nls "Starting \$script_name: ")"
 153
 154          ###
 155          # Start the 32-bit emulation for ia64
 156 @@ -295,12 +281,12 @@
 157             # These values can be different when PP loads from RD.
 158             #
 159             rm -f /dev/emcpower
 160 -           mmaj=`cat /sys/class/misc/emcpower/dev | gawk -F : '{print $1}'`
 161 -           mmin=`cat /sys/class/misc/emcpower/dev | gawk -F : '{print $2}'`
 162 +           mmaj=`cat /sys/class/misc/emcpower/dev | awk -F : '{print $1}'`
 163 +           mmin=`cat /sys/class/misc/emcpower/dev | awk -F : '{print $2}'`
 164             mknod /dev/emcpower c $mmaj $mmin > /dev/null
 165
 166             if [ $? -ne 0 ]; then
 167 -               echo "`eval_gettext \"failed to create emcpower device\"`"
 168 +                       nls "failed to create emcpower device"
 169              fi
 170
 171              if rc_status ; then
 172 @@ -311,7 +297,7 @@
 173                      unload_drivers
 174                  fi
 175              else
 176 -                echo "`eval_gettext \"PowerPath: unable to load PowerPath modules.\"`"
 177 +                               nls "PowerPath: unable to load PowerPath modules."
 178                  unload_drivers
 179              fi
 180          fi
 181 @@ -319,11 +305,11 @@
 182          ;;
 183
 184      stop)
 185 -        echo -n "`eval_gettext \"Stopping \\$script_name: \"`"
 186 +        eval echo -n "$(nls "Stopping \$script_name: ")"
 187          lsmod | grep -w '^emcp' > /dev/null
 188          if test $? -ne 0 ;
 189          then
 190 -                echo "`eval_gettext \"PowerPath is not running\"`"
 191 +                               nls "PowerPath is not running"
 192          else
 193              #
 194              # Tresspass can happen if new devices are added or some devices
 195 @@ -336,7 +322,7 @@
 196              if ok_to_stop; then
 197                  /sbin/powermt save > /dev/null 2>&1
 198                  rc_check
 199 -                /etc/opt/emcpower/emcpmgr unmap > /dev/null 2>&1
 200 +                /usr/sbin/emcpmgr unmap > /dev/null 2>&1
 201                  rc_check
 202                  /sbin/powermt remove dev=all 2> /var/tmp/.pp_exit
 203                  devr=$?
 204 @@ -347,19 +333,19 @@
 205                      unload_drivers
 206                      rc_check
 207                      if [ $? -ne 0 ] ; then
 208 -                        echo "`eval_gettext \"PowerPath could not unload PowerPath modules.\"`"
 209 +                                               nls "PowerPath could not unload PowerPath modules."
 210                      fi
 211                  else
 212                      if [ $cdevs -eq 0 ] ; then
 213                          unload_drivers
 214                          rc_check
 215                          if [ $? -ne 0 ] ; then
 216 -                            echo "`eval_gettext \"PowerPath could not unload PowerPath modules.\"`"
 217 +                                                       nls "PowerPath could not unload PowerPath modules."
 218                          fi
 219                      else
 220 -                        echo "`eval_gettext \"PowerPath devices are open.\"`"
 221 -                        echo "`eval_gettext \"Please close these devices and then re-issue \\$script_name stop.\"`"
 222 -                        /etc/opt/emcpower/emcpmgr map -p > /dev/null 2>&1
 223 +                                               nls "PowerPath devices are open."
 224 +                                               eval echo "$(nls "Please close these devices and then re-issue \$script_name stop.")"
 225 +                        /usr/sbin/emcpmgr map -p > /dev/null 2>&1
 226                          /sbin/powermt config   > /dev/null 2>&1
 227                          /bin/false
 228                      fi
 229 @@ -372,7 +358,7 @@
 230          ;;
 231      *)
 232          var=$0
 233 -       echo "`eval_gettext \"Usage: \\$var {start|stop}\"`"
 234 +               eval echo "$(nls "Usage: \$var {start\|stop}")"
 235         ;;
 236  esac
 237