mirror of
https://github.com/webmin/webmin.git
synced 2025-08-16 14:51:18 +00:00
Remove special-case replacement of stop script to fix an old bug
This commit is contained in:
20
makerpm.pl
20
makerpm.pl
@ -192,26 +192,6 @@ fi
|
||||
inetd=`grep "^inetd=" /etc/webmin/miniserv.conf 2>/dev/null | sed -e 's/inetd=//g'`
|
||||
startafter=0
|
||||
|
||||
# Fix old versions of Webmin that might kill the UI process on upgrade
|
||||
if [ -d /etc/webmin ]; then
|
||||
cat >/etc/webmin/stop 2>/dev/null <<'EOD'
|
||||
#!/bin/sh
|
||||
echo Stopping Webmin server in /usr/libexec/webmin
|
||||
pidfile=`grep "^pidfile=" /etc/webmin/miniserv.conf | sed -e 's/pidfile=//g'`
|
||||
pid=`cat \$pidfile`
|
||||
if [ "\$pid" != "" ]; then
|
||||
kill \$pid || exit 1
|
||||
if [ "\$1" = "--kill" ]; then
|
||||
sleep 1
|
||||
(kill -9 -- -\$pid || kill -9 \$pid) 2>/dev/null
|
||||
fi
|
||||
exit 0
|
||||
else
|
||||
exit 1
|
||||
fi
|
||||
EOD
|
||||
fi
|
||||
|
||||
if [ "\$1" != 1 ]; then
|
||||
# Upgrading the RPM, so stop the old webmin properly
|
||||
if [ "\$inetd" != "1" ]; then
|
||||
|
Reference in New Issue
Block a user