sshsh is totally obsolete, since we use lxc-userspace

diff --git a/Makefile b/Makefile
index 5da2c2a..b921db4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,6 @@ install-miscell:
        install -d -m 755 $(DESTDIR)/var/lib/nodemanager
        install -D -m 444 README $(DESTDIR)/$(datadir)/NodeManager/README
        install -D -m 644 logrotate/nodemanager $(DESTDIR)/etc/logrotate.d/nodemanager
-       install -D -m 755 sshsh $(DESTDIR)/bin/sshsh
        mkdir -p $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts
        rsync -av sliver-initscripts/ $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts/
        chmod 755 $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts/

diff --git a/nodemanager-lib.spec b/nodemanager-lib.spec
index 2db3276..8d3fd3b 100644 (file)
--- a/nodemanager-lib.spec
+++ b/nodemanager-lib.spec
@@ -137,7 +137,6 @@ rm -rf $RPM_BUILD_ROOT
 %{initdir}/
 %{_sysconfdir}/logrotate.d/nodemanager
 /var/lib/nodemanager/
-/bin/sshsh
 
 %changelog
 * Wed Dec 11 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-5.2-9

diff --git a/sshsh b/sshsh
deleted file mode 100755 (executable)
index b7a0264..0000000
--- a/sshsh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-# turn on debugging:
-# either set verbose to true right here
-# or call ssh slice@node -- -v ....
-verbose=
-MAC=$(virsh --connect lxc:// --readonly dumpxml $USER|grep mac|awk -F\' '{print $2}')
-IP=$(cat /var/lib/libvirt/dnsmasq/default.leases | grep $MAC | awk '{print $3}')
-shift
-case "$1" in -v|--verbose) verbose=true; shift ;; esac
-
-if [ -n "$verbose" ]; then
-    echo "sshsh: login=$USER"
-    echo "sshsh: args=>$@<"
-    echo "MAC=>$MAC<"
-    echo "IP=>$IP<"
-    echo "========== beg /var/lib/libvirt/dnsmasq/default.leases"
-    cat /var/lib/libvirt/dnsmasq/default.leases
-    echo "========== end /var/lib/libvirt/dnsmasq/default.leases"
-fi
-
-[ -z "$IP" ] && { echo "No IP found" ; exit 1; }
-
-exec ssh -o StrictHostKeyChecking=no root@$IP "$@"