[Astlinux-commits] SF.net SVN: astlinux:[6015] branches/1.0/package

[<abe...@us...>]

Revision: 6015
          http://astlinux.svn.sourceforge.net/astlinux/?rev=6015&view=rev
Author:   abelbeck
Date:     2013-03-25 23:23:38 +0000 (Mon, 25 Mar 2013)
Log Message:
-----------
no functional change, but fix any annoying issue with 'su' -> 'prosody' that required ignoring /dev/null.
The fix is to specify /bin/ash as the shell for 'su' since with our restrictive /etc/passwd's /bin/bash outputs the following error:
'shell-init: error retrieving current directory: getcwd: cannot access parent directories: Success'
which is unique to bash, so we now use ash with 'su'.

Modified Paths:
--------------
    branches/1.0/package/clix/sendxmpp
    branches/1.0/package/prosody/prosody.init

Modified: branches/1.0/package/clix/sendxmpp
===================================================================
--- branches/1.0/package/clix/sendxmpp	2013-03-25 18:55:40 UTC (rev 6014)
+++ branches/1.0/package/clix/sendxmpp	2013-03-25 23:23:38 UTC (rev 6015)
@@ -48,7 +48,7 @@
 
 help()
 {
-  su -p -c "/usr/bin/clix" prosody 2>/dev/null
+  su -p -s /bin/ash -c /usr/bin/clix prosody 2>/dev/null
   usage
 }
 
@@ -97,9 +97,9 @@
 do_clix()
 {
   if [ $debug -eq 1 ]; then
-    su -p -c "/usr/bin/clix $CMDS" prosody 2>&1 | grep -v '^shell-init'
+    su -p -s /bin/ash -c "/usr/bin/clix $CMDS" prosody
   else
-    su -p -c "/usr/bin/clix $CMDS" prosody 2>/dev/null
+    su -p -s /bin/ash -c "/usr/bin/clix $CMDS" prosody 2>/dev/null
   fi
 }
 

Modified: branches/1.0/package/prosody/prosody.init
===================================================================
--- branches/1.0/package/prosody/prosody.init	2013-03-25 18:55:40 UTC (rev 6014)
+++ branches/1.0/package/prosody/prosody.init	2013-03-25 23:23:38 UTC (rev 6015)
@@ -224,7 +224,7 @@
   if [ -f /etc/prosody/prosody.cfg.lua ] && grep -q '^[^-]*"posix"' /etc/prosody/prosody.cfg.lua; then
     echo "Starting XMPP Server..."
 
-    su -p -c "/usr/bin/prosody" prosody 2>/dev/null
+    su -p -s /bin/ash -c /usr/bin/prosody prosody
   fi
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.