From 4d097b9ef3bab751d4f4757faf1439447e1464df Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Tue, 5 Jul 2022 01:45:13 +0300
Subject: [PATCH] Start and stop unconditionally

---
 makerpm.pl | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/makerpm.pl b/makerpm.pl
index ecf92372..a290a48a 100755
--- a/makerpm.pl
+++ b/makerpm.pl
@@ -156,9 +156,7 @@
 if [ "\$1" != 1 ]; then
 	# Upgrading the RPM, so stop the old Usermin properly
 	if [ "\$inetd" != "1" ]; then
-		if [ -e /etc/usermin/.pre-install ]; then
-			/etc/usermin/.pre-install >/dev/null 2>&1 </dev/null
-		fi
+		/etc/usermin/stop >/dev/null 2>&1 </dev/null
 	fi
 fi
 cd /usr/libexec/usermin
@@ -186,16 +184,9 @@
 chmod 600 /tmp/.webmin/usermin-setup.out
 rm -f /var/lock/subsys/usermin
 if [ "\$inetd" != "1" ]; then
-	if [ "\$1" == 1 ]; then
-		/etc/usermin/start >/dev/null 2>&1 </dev/null
-		if [ "\$?" != "0" ]; then
-			echo "error: Usermin server cannot be started. It is advised to start it manually\n       by running \\"/etc/usermin/restart-by-force-kill\\" command"
-		fi
-	else
-		/etc/usermin/.post-install >/dev/null 2>&1 </dev/null
-		if [ "\$?" != "0" ]; then
-			echo "warning: Usermin server cannot be restarted. It is advised to restart it manually\n         by running \\"/etc/usermin/restart-by-force-kill\\" when upgrade process is finished"
-		fi
+	/etc/usermin/start >/dev/null 2>&1 </dev/null
+	if [ "\$?" != "0" ]; then
+		echo "error: Usermin server cannot be started. It is advised to start it manually\n        by running \\"/etc/usermin/restart-by-force-kill\\" command"
 	fi
 fi
 cat >/etc/usermin/uninstall.sh <<EOFF