VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-23 00:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix to call update boot script after adding boot #2133 [build]

Browse Source
This commit is contained in:
Ilia Ross
2024-04-21 17:45:10 +03:00
parent f1804201e6
commit 985129bb70
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
setup.pl
View File

@ -765,15 +765,6 @@ else {
chmod(0755, "$config_directory/reload"); chmod(0755, "$config_directory/reload");
chmod(0755, "$config_directory/.pre-install"); chmod(0755, "$config_directory/.pre-install");
chmod(0755, "$config_directory/.post-install"); chmod(0755, "$config_directory/.post-install");
# Fix existing systemd webmin.service file to update start and stop commands
chdir("$wadir/init");
system("$perl ".&quote_path("$wadir/init/updateboot.pl")." $bootscript");
}
else {
# Try to install init script to init.d
chdir("$wadir/init");
system("$perl ".&quote_path("$wadir/init/updateboot.pl")." $bootscript");
} }
} }
print ".. done\n"; print ".. done\n";
@ -837,6 +828,7 @@ if ($theme && -d "$wadir/$theme") {
# Set the product field in the global config # Set the product field in the global config
$gconfig{'product'} ||= "webmin"; $gconfig{'product'} ||= "webmin";
# Add boot script if needed
if ($makeboot) { if ($makeboot) {
print "Configuring Webmin to start at boot time ..\n"; print "Configuring Webmin to start at boot time ..\n";
chdir("$wadir/init"); chdir("$wadir/init");
@ -845,6 +837,9 @@ if ($makeboot) {
print "\n"; print "\n";
} }
# Update boot script if needed
chdir("$wadir/init");
system("$perl ".&quote_path("$wadir/init/updateboot.pl")." $bootscript");
# If password delays are not specifically disabled, enable them # If password delays are not specifically disabled, enable them
if (!defined($miniserv{'passdelay'}) && $os_type ne 'windows') { if (!defined($miniserv{'passdelay'}) && $os_type ne 'windows') {

7
setup.sh
View File

@ -791,9 +791,6 @@ if [ -x "$systemctlcmd" ]; then
chmod 755 $config_dir/stop $config_dir/start $config_dir/restart $config_dir/restart-by-force-kill $config_dir/reload $config_dir/.pre-install $config_dir/.post-install chmod 755 $config_dir/stop $config_dir/start $config_dir/restart $config_dir/restart-by-force-kill $config_dir/reload $config_dir/.pre-install $config_dir/.post-install
fi fi
# Fix existing systemd webmin.service file to update start and stop commands
(cd "$wadir/init" ; WEBMIN_CONFIG=$config_dir WEBMIN_VAR=$var_dir "$wadir/init/updateboot.pl" "$bootscript")
if [ "$upgrading" = 1 -a "$inetd" != "1" -a "$nostop" = "" ]; then if [ "$upgrading" = 1 -a "$inetd" != "1" -a "$nostop" = "" ]; then
# Stop old version, with updated stop script # Stop old version, with updated stop script
$config_dir/.pre-install >/dev/null 2>&1 $config_dir/.pre-install >/dev/null 2>&1
@ -898,6 +895,7 @@ if [ "$?" != "0" ]; then
echo product=webmin >> $config_dir/config echo product=webmin >> $config_dir/config
fi fi
# Add boot script if needed
if [ "$makeboot" = "1" ]; then if [ "$makeboot" = "1" ]; then
echo "Configuring Webmin to start at boot time .." echo "Configuring Webmin to start at boot time .."
(cd "$wadir/init" ; WEBMIN_CONFIG=$config_dir WEBMIN_VAR=$var_dir "$wadir/init/atboot.pl" $bootscript) (cd "$wadir/init" ; WEBMIN_CONFIG=$config_dir WEBMIN_VAR=$var_dir "$wadir/init/atboot.pl" $bootscript)
@ -905,6 +903,9 @@ if [ "$makeboot" = "1" ]; then
echo "" echo ""
fi fi
# Update boot script if needed
(cd "$wadir/init" ; WEBMIN_CONFIG=$config_dir WEBMIN_VAR=$var_dir "$wadir/init/updateboot.pl" "$bootscript")
# If password delays are not specifically disabled, enable them # If password delays are not specifically disabled, enable them
grep passdelay= $config_dir/miniserv.conf >/dev/null grep passdelay= $config_dir/miniserv.conf >/dev/null
if [ "$?" != "0" ]; then if [ "$?" != "0" ]; then