Fix name and path of pl_sshd wrapper script to satisfy re-exec

diff --git a/pl_sshd b/pl_sshd
index e6f2f2e..018b5e4 100644 (file)
--- a/pl_sshd
+++ b/pl_sshd
@@ -23,7 +23,7 @@ RETVAL=0
 prog="pl_sshd"
 
 # Some functions to make the below more readable
-SSHD=/usr/local/sbin/pl_sshd.sh
+SSHD=/usr/local/sbin/pl_sshd
 PID_FILE=/var/run/pl_sshd.pid
 
 do_restart_sanity_check()

diff --git a/pl_sshd.sh b/pl_sshd.sh
index 2249823..0758033 100755 (executable)
--- a/pl_sshd.sh
+++ b/pl_sshd.sh
@@ -21,4 +21,4 @@
 name=pl_sshd
 echo "$@" | grep -q -- '-p[ 0-9]' || port='-p 806'
 
-exec -a /usr/sbin/pl_sshd /usr/sbin/sshd -o "PidFile /var/run/$name.pid" $port "$@"
+exec -a /usr/local/sbin/pl_sshd /usr/sbin/sshd -o "PidFile /var/run/$name.pid" $port "$@"

diff --git a/pl_sshd.spec b/pl_sshd.spec
index 734d30d..c07ff77 100644 (file)
--- a/pl_sshd.spec
+++ b/pl_sshd.spec
@@ -1,6 +1,6 @@
 %define name pl_sshd
 %define version 1.0
-%define release 8.planetlab%{?date:.%{date}}
+%define release 9.planetlab%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
@@ -31,7 +31,7 @@ directory.
 
 %install
 mkdir -p $RPM_BUILD_ROOT/var/pl_sshd/keys
-install -D -m 0755 pl_sshd.sh $RPM_BUILD_ROOT/usr/local/sbin/pl_sshd.sh
+install -D -m 0755 pl_sshd.sh $RPM_BUILD_ROOT/usr/local/sbin/pl_sshd
 install -D -m 0755 pl_sshd $RPM_BUILD_ROOT/etc/init.d/pl_sshd
 install -D -m 0755 auto.pl_sshd.py $RPM_BUILD_ROOT/etc/auto.pl_sshd
 
@@ -41,7 +41,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %dir /var/pl_sshd/keys
-%attr(0755,root,root) /usr/local/sbin/pl_sshd.sh
+%attr(0755,root,root) /usr/local/sbin/pl_sshd
 %attr(0755,root,root) /etc/init.d/pl_sshd
 %attr(0755,root,root) /etc/auto.pl_sshd
 
@@ -133,6 +133,9 @@ fi
 
 
 %changelog
+* Wed Oct 12 2005 Steve Muir <smuir@cs.princeton.edu>
+- fix pl_sshd script name and argv[0] to satisfy re-exec requirements
+
 * Thu Apr  7 2005 Steve Muir <smuir@cs.princeton.edu>
 - convert auto.pl_sshd to a python script (simpler and less error-prone)