Factor out check for atd init script

This commit is contained in:
Jamie Cameron 2025-04-27 09:44:53 -07:00
parent ebf1138788
commit d073280e80
2 changed files with 36 additions and 26 deletions

View File

@ -153,5 +153,18 @@ else {
}
}
# get_init_status()
# If the init module is installed and there is an atd bootup action, return
# its name, current running status and boot status
sub get_init_status
{
return () if (!&foreign_available("init"));
my $init = defined(&get_init_name) ? &get_init_name() : undef;
return () if (!$init);
my $r = &init::status_action($init);
my $atboot = &init::action_status($init);
return ($init, $r, $atboot);
}
1;

View File

@ -138,10 +138,8 @@ if ($access{'allow'} && $config{'allow_file'}) {
}
# If there is an init script that runs an atd server, show status
if (&foreign_available("init")) {
&foreign_require("init");
my $init = defined(&get_init_name) ? &get_init_name() : undef;
if ($access{'stop'} && $init) {
my ($init, $r, $atboot) = &get_init_status();
if ($access{'stop'} && $init) {
print &ui_hr();
print &ui_buttons_start();
@ -166,7 +164,6 @@ if (&foreign_available("init")) {
print &ui_buttons_end();
}
}
&ui_print_footer("/", $text{'index'});