diff options
| author | Alex Landau <alex.landau@xorcom.com> | 2008-12-28 11:51:06 +0000 |
|---|---|---|
| committer | Alex Landau <alex.landau@xorcom.com> | 2008-12-28 11:51:06 +0000 |
| commit | ecb7b1ddf0445eafea9242c5b5062d5975ac1de7 (patch) | |
| tree | 49e922df3cc852102ca50c4d38b434ebc0f020cd | |
| parent | 3600a6d1a64202e013d715d93e2dc24ac1d6d450 (diff) | |
rapid-tunneling:
- Server: Fix server startup, rename init.d file to sshd_support (to match RPM).
- Client: Use busybox start-stop-daemon only if /sbin/start-stop-daemon is unavailable.
- Fix warnings during upgrading of debs.
git-svn-id: svn+ssh://xorcom/home/svn/debs/components/rapid-tunneling@6503 283159da-0705-0410-b60c-f2062b4bb6ad
| -rw-r--r-- | debian/prerm | 3 | ||||
| -rw-r--r-- | debian/rapid-tunneling-server.prerm | 3 | ||||
| -rwxr-xr-x | debian/rules | 6 | ||||
| -rwxr-xr-x | rapid-tunneling | 8 | ||||
| -rwxr-xr-x | sshd_support_debian | 2 |
5 files changed, 17 insertions, 5 deletions
diff --git a/debian/prerm b/debian/prerm index 6eb5232..1ac9c16 100644 --- a/debian/prerm +++ b/debian/prerm @@ -22,6 +22,9 @@ case "$1" in userdel -r rapid-tunneling || : ;; + upgrade) + ;; + failed-upgrade) ;; diff --git a/debian/rapid-tunneling-server.prerm b/debian/rapid-tunneling-server.prerm index c0c1ee2..bd3bd15 100644 --- a/debian/rapid-tunneling-server.prerm +++ b/debian/rapid-tunneling-server.prerm @@ -22,6 +22,9 @@ case "$1" in userdel support || : ;; + upgrade) + ;; + failed-upgrade) ;; diff --git a/debian/rules b/debian/rules index ab0251a..6c93afc 100755 --- a/debian/rules +++ b/debian/rules @@ -8,11 +8,11 @@ DEB_MAKE_BUILD_TARGET = dummy DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEB_DESTDIR) clean:: - rm -f debian/rapid-tunneling-server.ssh_support.init + rm -f debian/rapid-tunneling-server.sshd_support.init build/rapid-tunneling-server:: - cp sshd_support_debian debian/rapid-tunneling-server.ssh_support.init + cp sshd_support_debian debian/rapid-tunneling-server.sshd_support.init install/rapid-tunneling-server:: - dh_installinit -p rapid-tunneling-server --name=ssh_support + dh_installinit -p rapid-tunneling-server --name=sshd_support diff --git a/rapid-tunneling b/rapid-tunneling index 1528e2e..c563b75 100755 --- a/rapid-tunneling +++ b/rapid-tunneling @@ -29,4 +29,10 @@ rm -rf $tmpdir # Remove host key of $host (in case it has changed) ssh-keygen -R $host 2>/dev/null || true # Run in background -busybox start-stop-daemon -S -b -m -p $HOME/pid -x /bin/sh -- -c "exec ssh -o 'StrictHostKeyChecking no' -o 'BatchMode yes' -o 'ServerAliveInterval 60' -T -p $port -i $HOME/key -R $tunnelport:127.0.0.1:22 -l $user $host < $HOME/ra-params.tar.gz" +if [ -x /sbin/start-stop-daemon ]; then + SSD=/sbin/start-stop-daemon +else + SSD="busybox start-stop-daemon" +fi + +$SSD -S -b -m -p $HOME/pid -x /bin/sh -- -c "exec ssh -o 'StrictHostKeyChecking no' -o 'BatchMode yes' -o 'ServerAliveInterval 60' -T -p $port -i $HOME/key -R $tunnelport:127.0.0.1:22 -l $user $host < $HOME/ra-params.tar.gz" diff --git a/sshd_support_debian b/sshd_support_debian index 4b9577f..0cbcd4f 100755 --- a/sshd_support_debian +++ b/sshd_support_debian @@ -24,7 +24,7 @@ fi . /lib/lsb/init-functions PID_FILE=/var/run/sshd_support.pid -SSHD_OPTS="$SSHD_OPTS -f /etc/ssh/sshd_support_config -o 'PidFile $PID_FILE'" +SSHD_OPTS="$SSHD_OPTS -f /etc/ssh/sshd_support_config -o PidFile=$PID_FILE" if [ -n "$2" ]; then SSHD_OPTS="$SSHD_OPTS $2" fi |