Don't attempt to automatically restart sshd, it's way too error-prone

[pl_sshd.git] / pl_sshd.spec

diff --git a/pl_sshd.spec b/pl_sshd.spec
index 18fddff..79fdad8 100644 (file)
--- a/pl_sshd.spec
+++ b/pl_sshd.spec
@@ -1,7 +1,7 @@
 Summary: SSH server config for PlanetLab
 Name: pl_sshd
 Version: 1.0
-Release: 1
+Release: 3
 Requires: autofs, openssh-server
 Copyright: GPL
 URL: http://www.planet-lab.org
@@ -13,7 +13,7 @@ SSH server configuration for PlanetLab nodes.  Configures an automounted
 directory as source for authorized_keys files and points sshd to that
 directory.
 
-$Header: /cvs/pl_sshd/pl_sshd.spec,v 1.2 2003/12/01 14:56:00 sjm-pl_sshd Exp $.
+$Header: /cvs/pl_sshd/pl_sshd.spec,v 1.6 2003/12/03 22:33:50 sjm-pl_sshd Exp $
 %prep
 %setup
 
@@ -71,16 +71,24 @@ if [ "$1" -ge 1 ]; then
        chkconfig --add pl_sshd
 
        if [[ "$RUNLEVEL" != "unknown" ]]; then
-               /etc/init.d/autofs restart
-               /etc/init.d/sshd restart
-               /etc/init.d/pl_sshd start
+           #
+           # don't try to start/restart various things automatically,
+           # it's too ugly (particularly if we're upgrading while
+           # connected over ssh)
+           #
+           echo
+           echo "You need to manually restart autofs and sshd, and"
+           echo "start the pl_sshd (ssh on port 806) service."
+           echo "Make sure you know what you're doing, particularly"
+           echo "if you're making this change over an ssh connection."
+           echo
        fi
 fi
 
 %preun
 RUNLEVEL=`/sbin/runlevel`
 
-if [ "$1" = 0 ]; then
+if [ "$1" -ge "0" ]; then
        #
        # stop pl_sshd, remove it from rcX.d init dirs, remove link
        # to sshd's pam config
@@ -91,11 +99,16 @@ if [ "$1" = 0 ]; then
 
        #
        # remove funky config options for sshd (so that when we restart
-       # things will operate normally i.e., without automount magic),
-       # then restart
+       # things will operate normally i.e., without automount magic)
        #
        rm /etc/sysconfig/sshd
-       [ "$RUNLEVEL" != "unknown" ] && /etc/init.d/sshd restart
+       if [ "$RUNLEVEL" != "unknown" ]; then
+           echo
+           echo "You need to manually restart sshd."
+           echo "Make sure you know what you're doing, particularly"
+           echo "if you're making this change over an ssh connection."
+           echo
+       fi
 
        #
        # stop automounter, remove entry from auto.master, restart if