[Pkg-zenoss-commits] r230 - /packages/zenoss/trunk/debian/patches/bin-zenoss-fix.dpatch

[bzed-guest at users.alioth.debian.org]

Author: bzed-guest
Date: Tue Jul 10 23:47:33 2007
New Revision: 230

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=230
Log:
the bin/zenoss patch needed some minor fixes

Modified:
    packages/zenoss/trunk/debian/patches/bin-zenoss-fix.dpatch

Modified: packages/zenoss/trunk/debian/patches/bin-zenoss-fix.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/bin-zenoss-fix.dpatch?rev=230&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/patches/bin-zenoss-fix.dpatch (original)
+++ packages/zenoss/trunk/debian/patches/bin-zenoss-fix.dpatch Tue Jul 10 23:47:33 2007
@@ -6,9 +6,9 @@
 
 @DPATCH@
 diff -urNad zenoss~/bin/zenoss zenoss/bin/zenoss
---- zenoss~/bin/zenoss	2007-07-09 18:38:40.000000000 +0200
-+++ zenoss/bin/zenoss	2007-07-09 18:52:43.000000000 +0200
-@@ -19,37 +19,15 @@
+--- zenoss~/bin/zenoss	2007-07-11 01:40:39.000000000 +0200
++++ zenoss/bin/zenoss	2007-07-11 01:41:13.000000000 +0200
+@@ -19,40 +19,17 @@
  #############################################################################
  # Attempt to set ZENHOME if it is not already set, or bogus
  # by calculating it relative to the executing command
@@ -32,8 +32,6 @@
 -fi
 +
 +USERNAME=zenoss
-+. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
-+
  
  if [ `id -u` -eq 0 ] ; then
 -   USERNAME=`ls -l $ZENHOME/var/Data.fs | awk '{ print $3 }'`
@@ -44,14 +42,20 @@
 -   chown -R $USERNAME $ZENHOME/var
 -   chown -R $USERNAME $ZENHOME/log
 -   exec su - $USERNAME $0 $@
-+   exec su - $USERNAME -s /bin/bash -c "/var/lib/zenoss/bin/zenoss $@"
++   exec su - $USERNAME -s /bin/bash -c "/var/lib/zenoss/bin/zenoss $*"
  fi
  
 -. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
++. $(getent passwd $USERNAME | cut -d : -f 6)/bin/zenfunctions
++
++
  C=
- C="$C zeoctl"
- C="$C zopectl"
-@@ -64,12 +42,10 @@
+-C="$C zeoctl"
+-C="$C zopectl"
+ C="$C zenhub"
+ C="$C zenping"
+ C="$C zensyslog"
+@@ -64,12 +41,10 @@
  C="$C zenperfsnmp"
  C="$C zencommand"
  C="$C zenprocess"