[Pkg-freevo-maint] r66 - packages/freevo/trunk/debian

[mennucc1 at alioth.debian.org]

Author: mennucc1
Date: 2008-01-24 15:19:33 +0000 (Thu, 24 Jan 2008)
New Revision: 66

Added:
   packages/freevo/trunk/debian/freevo+log
Modified:
   packages/freevo/trunk/debian/control
   packages/freevo/trunk/debian/freevo.freevo_xserver.init
   packages/freevo/trunk/debian/rules
Log:
Workaround to the "cant start X as non-root user" problem.
With this change, /etc/init.d/freevo_xserver works,
and starts an X server (display :1.0 ) on virtual terminal 9
(so it can be started alongside the usual gdm/kdm ).


Modified: packages/freevo/trunk/debian/control
===================================================================
--- packages/freevo/trunk/debian/control	2008-01-24 13:48:43 UTC (rev 65)
+++ packages/freevo/trunk/debian/control	2008-01-24 15:19:33 UTC (rev 66)
@@ -15,7 +15,7 @@
 Architecture: all
 Section: python
 XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends},  python-alsaaudio, python-xml, python-libxml2, python-beautifulsoup (>= 3.0.1), python-kaa-imlib2 (>= 0.2.2), python-kaa-metadata (>= 0.7.1), python-elementtree, python-pygame, python-imaging, python-twisted (>= 2.5.0), python-sqlite
+Depends: ${python:Depends},  python-alsaaudio, python-xml, python-libxml2, python-beautifulsoup (>= 3.0.1), python-kaa-imlib2 (>= 0.2.2), python-kaa-metadata (>= 0.7.1), python-elementtree, python-pygame, python-imaging, python-twisted (>= 2.5.0), python-sqlite, console-tools
 Description: Python modules for Freevo
  This package contains python modules for Freevo
 

Added: packages/freevo/trunk/debian/freevo+log
===================================================================
--- packages/freevo/trunk/debian/freevo+log	                        (rev 0)
+++ packages/freevo/trunk/debian/freevo+log	2008-01-24 15:19:33 UTC (rev 66)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+unset OS_LOGDIR FREEVO_LOGDIR OS_STATICDIR FREEVO_STATICDIR OS_CACHEDIR FREEVO_CACHEDIR FREEVO_SHARE FREEVO_CONTRIB FREEVO_SCRIPT FREEVO_CONFIG LD_PRELOAD SDL_VIDEODRIVER FREEVO_LOCALE FREEVO_PYTHON
+
+test -r /etc/freevo/debconf.sh && . /etc/freevo/debconf.sh
+
+test -r /etc/default/freevo && . /etc/default/freevo
+
+[ -d $HOME/log  ] || mkdir $HOME/log
+[ -f $HOME/log/Xfreevo.log  ] && mv $HOME/log/Xfreevo.log{,~}
+
+exec >> $HOME/log/Xfreevo.log
+exec 2>> $HOME/log/Xfreevo.log
+exec /usr/bin/freevo.real "$@"
+

Modified: packages/freevo/trunk/debian/freevo.freevo_xserver.init
===================================================================
--- packages/freevo/trunk/debian/freevo.freevo_xserver.init	2008-01-24 13:48:43 UTC (rev 65)
+++ packages/freevo/trunk/debian/freevo.freevo_xserver.init	2008-01-24 15:19:33 UTC (rev 66)
@@ -11,15 +11,15 @@
 # Description:
 ### END INIT INFO
 
-
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/bin/freevo.real
+DAEMONLOG=/usr/share/freevo/contrib/freevo+log
 
 test -x $DAEMON || exit
 
-if [ `id -u` = 0 ] ; then
-  #echo switching to freevo user
-  exec su freevo -c "$0 $@"
+if [ ! `id -u` = 0 ] ; then
+  echo This script must be run as root 
+  exit 1
 fi
 
 . /lib/lsb/init-functions
@@ -42,15 +42,7 @@
 test "${NOMOUSE}" = "true" && export SDL_NOMOUSE=true
 
 startx_freevo() {
-    [ -d $HOME/log  ] || mkdir $HOME/log
-    [ -f $HOME/log/Xfreevo.log  ] && mv $HOME/log/Xfreevo.log{,~}
-
-    # TODO if I redirect, this process is not attached to the console,
-    #  and then X refuses to start (in Debian standard Xorg config)
-    #(	exec >> $HOME/log/Xfreevo.log
-    #	exec 2>> $HOME/log/Xfreevo.log
-	startx  $DAEMON   -- :1 vt9 -quiet
-    #) &
+ openvt -c 9 su freevo -c  "startx  $DAEMONLOG   -- :1 vt9  -quiet"
 }
 
 start_freevo() {
@@ -61,13 +53,13 @@
 
 stop_freevo() {
     log_action_msg "Sopping Freevo Home Theatre PC Platform (frontend)"
-    $DAEMON stop
+    su freevo -c "$DAEMON stop"    
     log_action_end_msg $?
 }
 
 restart_freevo() {
     log_action_msg "Restarting Freevo Home Theatre PC Platform (frontend)"
-    $DAEMON stop
+    su freevo -c "$DAEMON stop"
     sleep 5
     startx_freevo
     log_action_end_msg $?

Modified: packages/freevo/trunk/debian/rules
===================================================================
--- packages/freevo/trunk/debian/rules	2008-01-24 13:48:43 UTC (rev 65)
+++ packages/freevo/trunk/debian/rules	2008-01-24 15:19:33 UTC (rev 66)
@@ -43,6 +43,7 @@
 
 	mv $(CURDIR)/debian/tmp/usr/bin/freevo  $(CURDIR)/debian/tmp/usr/bin/freevo.real
 	install  $(CURDIR)/debian/freevo.wrapper  $(CURDIR)/debian/tmp/usr/bin/freevo
+	install  $(CURDIR)/debian/freevo+log  $(CURDIR)/debian/tmp/usr/share/freevo/contrib/freevo+log
 
 	dh_installinit -pfreevo --no-start --name=freevo_xserver
 	dh_installinit -pfreevo --no-start --name=freevo_recordserver