michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Prevent fixing already fixed stop script

Browse Source
This commit is contained in:
Ilia
2022-04-22 15:05:17 +03:00
parent 5640bd6028
commit 8f3b2e350f
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
makedebian.pl
View File

@@ -265,8 +265,9 @@ open(SCRIPT, ">$postinstall_file");
print SCRIPT <<EOF;
#!/bin/sh
# Fix old versions of Webmin that might kill the UI process on upgrade
if [ -d /etc/webmin ]; then
# Fix old versions of Webmin that might kill the UI
# process on upgrade, unless it's already fixed version
if [ -d /etc/webmin ] && [ ! -f "/etc/webmin/stop-init" ]; then
cat >/etc/webmin/stop 2>/dev/null <<'EOD'
#!/bin/sh
pidfile=`grep "^pidfile=" /etc/webmin/miniserv.conf | sed -e 's/pidfile=//g'`
@@ -282,7 +283,7 @@ fi
inetd=`grep "^inetd=" /etc/$baseproduct/miniserv.conf 2>/dev/null | sed -e 's/inetd=//g'`
if [ "\$1" = "upgrade" -a "\$1" != "abort-upgrade" ]; then
# Upgrading the package, so stop the old webmin properly
# Upgrading the package, so stop the old Webmin properly
if [ "\$inetd" != "1" ]; then
/etc/$baseproduct/stop >/dev/null 2>&1 </dev/null
fi
@@ -328,7 +329,7 @@ fi
rm -f /var/lock/subsys/$baseproduct
if [ -x "\$(command -v systemctl)" >/dev/null 2>&1 ] && [ -d "/etc/systemd" ]; then
systemctl daemon-reload >/dev/null 2>&1
fi
if [ "$inetd" != "1" ]; then
if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then

7
makerpm.pl
View File

@@ -172,8 +172,9 @@ 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
# Fix old versions of Webmin that might kill the UI
# process on upgrade, unless it's already fixed version
if [ -d /etc/webmin ] && [ ! -f "/etc/webmin/stop-init" ]; then
cat >/etc/webmin/stop 2>/dev/null <<'EOD'
#!/bin/sh
pidfile=`grep "^pidfile=" /etc/webmin/miniserv.conf | sed -e 's/pidfile=//g'`
@@ -188,7 +189,7 @@ EOD
fi
if [ "\$1" != 1 ]; then
# Upgrading the RPM, so stop the old webmin properly
# Upgrading the RPM, so stop the old Webmin properly
if [ "\$inetd" != "1" ]; then
kill -0 `cat /var/webmin/miniserv.pid 2>/dev/null` 2>/dev/null
if [ "\$?" = 0 ]; then