[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-105-gac1319a
Andreas Beckmann
anbe at debian.org
Mon Feb 25 11:02:00 UTC 2013
The following commit has been merged in the develop branch:
commit 036270d7fee748f3078638c3c6da09c558589ecf
Author: Andreas Beckmann <anbe at debian.org>
Date: Sat Feb 23 19:06:27 2013 +0100
slave_run: do not run the screen as root
Signed-off-by: Andreas Beckmann <anbe at debian.org>
diff --git a/conf/crontab-slave.in b/conf/crontab-slave.in
index 6422372..37688f2 100644
--- a/conf/crontab-slave.in
+++ b/conf/crontab-slave.in
@@ -3,7 +3,7 @@
#
# start slave_run automatically after reboots
#
- at reboot @sharedir@/piuparts/slave/slave_cleanup ; sudo @sharedir@/piuparts/slave/slave_run
+ at reboot @sharedir@/piuparts/slave/slave_cleanup ; @sharedir@/piuparts/slave/slave_run
#
# monitor slave session every hour
diff --git a/slave-bin/slave_run.in b/slave-bin/slave_run.in
index ffdd8df..f2b2a02 100755
--- a/slave-bin/slave_run.in
+++ b/slave-bin/slave_run.in
@@ -41,7 +41,7 @@ cd /org/piuparts.debian.org/slave
rm -f $SCREENLOG # used by ~piupartsm/bin/detect_slave_problems
trap "cat $SCREENLOG | mail -s 'slave abnormaly ended' piupartsm ; rm $SCREENLOG; exit" TERM EXIT
-screen -L -d -m -S $SESSIONNAME su - piupartss -c "cd /org/piuparts.debian.org/slave && PYTHONPATH=$PYTHONPATH python ../share/piuparts/piuparts-slave"
+screen -L -d -m -S $SESSIONNAME @sharedir@/piuparts/piuparts-slave
trap - TERM EXIT
echo "piuparts-slave has been started."
--
piuparts git repository
More information about the Piuparts-commits
mailing list