VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-08-19 01:15:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix to suppress output from init scripts

Browse Source 
We already have `Attempting to start Webmin web server ..` being printed. As the init scripts have prompt we also need to handle it
This commit is contained in:
Ilia Ross
2023-10-13 14:11:06 +03:00
parent 46375d60c2
commit b9f1d5df1d
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
setup.pl
View File

@ -597,14 +597,14 @@ else {
# Define final start command
if ($upgrading) {
if ($killmodenonepl == 1) {
$start_cmd = "$config_directory/.reload-init";
$start_cmd = "$config_directory/.reload-init >/dev/null 2>&1 </dev/null";
}
else {
$start_cmd = "$config_directory/.post-install";
$start_cmd = "$config_directory/.post-install >/dev/null 2>&1 </dev/null";
}
}
else {
$start_cmd = "$config_directory/start";
$start_cmd = "$config_directory/start >/dev/null 2>&1 </dev/null";
}
# Stop main
@ -943,7 +943,7 @@ if (!$ENV{'nostart'}) {
}
my $start_cmd_extra;
if ($upgrading && $killmodenonepl == 1) {
$start_cmd_extra = "$config_directory/.reload-init-systemd";
$start_cmd_extra = "$config_directory/.reload-init-systemd >/dev/null 2>&1 </dev/null";
if (-r $start_cmd_extra) {
$start_cmd .= " ; $start_cmd_extra";
}

6
setup.sh
View File

@ -1014,13 +1014,13 @@ if [ "$nostart" = "" ]; then
# If upgrading, restart
if [ "$upgrading" = "1" ]; then
if [ "$killmodenonesh" != "1" ]; then
$config_dir/.post-install >/dev/null 2>&1
$config_dir/.post-install >/dev/null 2>&1 </dev/null
else
$config_dir/.reload-init >/dev/null 2>&1
$config_dir/.reload-init >/dev/null 2>&1 </dev/null
fi
# If installing first time, start it
else
$config_dir/start >/dev/null 2>&1
$config_dir/start >/dev/null 2>&1 </dev/null
fi
if [ $? != "0" ]; then