[Piuparts-commits] [piuparts] 01/04: slave_run: ensure screen is run with SHELL=/bin/bash

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit 4489a834ffc72c2a3db5bc0cc0d161e43b724ef8
Author: Andreas Beckmann <anbe at debian.org>
Date:   Thu Aug 3 02:24:50 2017 +0200

    slave_run: ensure screen is run with SHELL=/bin/bash
    
    would be /bin/sh if started from cron
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog       | 1 +
 slave-bin/slave_run.in | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f10fe45..0a2a54a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ piuparts (0.79) UNRELEASED; urgency=medium
   * Move some exceptions to {pre,post}_test_exceptions.
   * scripts/post_distupgrade_base_cleanup: Remove pinentry-curses from the
     stretch (--install-recommends) reference chroot.
+  * slave_run: Ensure screen is run with SHELL=/bin/bash.
 
  -- Holger Levsen <holger at debian.org>  Mon, 31 Jul 2017 13:35:18 -0400
 
diff --git a/slave-bin/slave_run.in b/slave-bin/slave_run.in
index d56a107..2a90296 100755
--- a/slave-bin/slave_run.in
+++ b/slave-bin/slave_run.in
@@ -55,7 +55,7 @@ mkdir -p $SLAVEROOT
 cd $SLAVEROOT
 
 # Ensure the screen session exists, run normal shell in screen 0
-screen -S $SESSIONNAME -d -m
+SHELL=/bin/bash screen -S $SESSIONNAME -d -m
 echo "Started screen session '$SESSIONNAME'."
 
 # run this on a single slave or a sequence of slaves
@@ -76,8 +76,7 @@ do
 
 	# Launch the slave.
 	screen -S $SESSIONNAME -p $SLAVENUM -X stuff "
-cd $SLAVEDIR
- at sharedir@/piuparts/piuparts-slave
+cd $SLAVEDIR && @sharedir@/piuparts/piuparts-slave
 "
 
 	echo "piuparts-slave $SLAVENUM has been started."

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git