michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-06-24 04:50:30 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Change stop script to only kill -9 if the --kill flag is given, and adjust the setup script to only run it after re-creation by the new version

Browse Source
This commit is contained in:
Jamie Cameron
2020-07-04 20:36:49 -07:00
parent b7ec392bba
commit b129fd8a27
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
setup.sh
View File

@@ -159,11 +159,6 @@ if [ "$upgrading" = 1 ]; then
atboot=`grep "^atboot=" $config_dir/miniserv.conf | sed -e 's/atboot=//g'`
inetd=`grep "^inetd=" $config_dir/miniserv.conf | sed -e 's/inetd=//g'`
if [ "$inetd" != "1" ]; then
# Stop old version
$config_dir/stop >/dev/null 2>&1
fi
# Copy files to target directory
if [ "$wadir" != "$srcdir" ]; then
echo "Copying files to $wadir .."
@@ -625,15 +620,17 @@ echo "pidfile=\`grep \"^pidfile=\" $config_dir/miniserv.conf | sed -e 's/pidfile
echo "pid=\`cat \$pidfile\`" >>$config_dir/stop
echo "if [ \"\$pid\" != \"\" ]; then" >>$config_dir/stop
echo " kill \$pid || exit 1" >>$config_dir/stop
echo " sleep 1" >>$config_dir/stop
echo " (kill -9 -- -\$pid || kill -9 \$pid) 2>/dev/null" >>$config_dir/stop
echo " if [ \"\$1\" = \"--kill\" ]; then" >>$config_dir/stop
echo " sleep 1" >>$config_dir/stop
echo " (kill -9 -- -\$pid || kill -9 \$pid) 2>/dev/null" >>$config_dir/stop
echo " fi" >>$config_dir/stop
echo " exit 0" >>$config_dir/stop
echo "else" >>$config_dir/stop
echo " exit 1" >>$config_dir/stop
echo "fi" >>$config_dir/stop
echo "#!/bin/sh" >>$config_dir/restart
echo "$config_dir/stop && $config_dir/start" >>$config_dir/restart
echo "$config_dir/stop --kill && $config_dir/start" >>$config_dir/restart
echo "#!/bin/sh" >>$config_dir/reload
echo "echo Reloading Webmin server in $wadir" >>$config_dir/reload
@@ -644,6 +641,11 @@ chmod 755 $config_dir/start $config_dir/stop $config_dir/restart $config_dir/rel
echo "..done"
echo ""
if [ "$upgrading" = 1 -a "$inetd" != "1" ]; then
# Stop old version, with updated stop script
$config_dir/stop >/dev/null 2>&1
fi
if [ "$upgrading" = 1 ]; then
echo "Updating config files.."
else