summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Ogden <bernie.ogden@linaro.org>2016-03-09 11:56:23 +0000
committerBernard Ogden <bernie.ogden@linaro.org>2016-03-09 11:56:23 +0000
commit83f9b0b3dba3731f931f6055dab7b3c2f8dff041 (patch)
treebd25fc24c1be75374cce7d43be549c4c27298464
parent6960860b8dfb71387b13a97d169dd730c5435e9c (diff)
Rip out a bunch of stuffHEADmaster
Some of it is just extraneous, some of it will screw up dummy-ssh devices. Change-Id: Ib5c84883108ccd7e71095d859273dffb948b5f36
-rwxr-xr-xinvoke_session_debian24
-rwxr-xr-xsetup_session_debian13
-rwxr-xr-xstop_hacking_debian2
3 files changed, 0 insertions, 39 deletions
diff --git a/invoke_session_debian b/invoke_session_debian
index 9f05390..439d298 100755
--- a/invoke_session_debian
+++ b/invoke_session_debian
@@ -44,23 +44,6 @@ fi
EOF
IRC_AVAILABLE=false
-if [ ! -z "${IRC_USER}" ]; then
- if apt-get install -qq python-irc; then
- IRC_AVAILABLE=true
- TMP_IRC_USER=hs-${RANDOM}
- # make a unique user
- cat <<EOF | python /usr/share/doc/python-irc/examples/irccat2.py ${IRC_SERVER} ${TMP_IRC_USER} ${IRC_USER}
-Your hacking session is now ready
-Please connect to:
-${SSH_COMMAND}
-EOF
- fi
-fi
-if [ ! -z "${NOTIFY_URL}" ]; then
- if apt-get install -qq wget; then
- wget -O - "${NOTIFY_URL}?ssh=${ip_addr}"
- fi
-fi
echo ""
mkdir -p /run
mkdir -p /run/hacking
@@ -89,13 +72,6 @@ do
if [ $ELAPSED -gt 691200 ]; then
echo "No user logged in. Terminating session..."
TERMINATED=true
- if ${IRC_AVAILABLE}; then
- # make a unique user
- cat <<EOF | python /usr/share/doc/python-irc/examples/irccat2.py ${IRC_SERVER} ${TMP_IRC_USER} ${IRC_USER}
-Your hacking session was terminated due to inactivity
-There was no user logged in for ${ELAPSED} seconds.
-EOF
- fi
lava-test-case hacking-session-terminated --result fail --measurement ${ELAPSED} --units seconds
stop_hacking
fi
diff --git a/setup_session_debian b/setup_session_debian
index f96553c..0988b5c 100755
--- a/setup_session_debian
+++ b/setup_session_debian
@@ -22,19 +22,6 @@ chmod 0600 ~/.ssh/authorized_keys
echo "Public Key Installed: $1"
lava-test-case public-key-installed --result pass
-# Account for running under sudo
-if [ ! -z "${SUDO_USER}" ]; then
- echo "Fixing up ${HOME}/.ssh permissions to ${SUDO_USER}:${SUDO_GID}"
- chown -R ${SUDO_USER}:${SUDO_GID} ${HOME}/.ssh
-fi
-
-grep -P "^LogLevel" /etc/ssh/sshd_config
-if [ $? -eq 0 ]; then
- sed -i "s/^LogLevel\ [A-Z]\+/LogLevel\ DEBUG/g" /etc/ssh/sshd_config
-else
- echo "LogLevel DEBUG" >> /etc/ssh/sshd_config
-fi
-
/etc/init.d/ssh restart
echo "sshd re-started"
if [ $? -eq 0 ]; then
diff --git a/stop_hacking_debian b/stop_hacking_debian
index 3c97348..8fbf3df 100755
--- a/stop_hacking_debian
+++ b/stop_hacking_debian
@@ -1,4 +1,2 @@
#!/bin/bash
rm /run/hacking/hacking.pid
-rm ~/.ssh/authorized_keys
-/etc/init.d/ssh stop