1berry/webmin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Factor out check for atd init script

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
at/at-lib.pl
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; 1;

49
at/index.cgi
View File

@ -138,34 +138,31 @@ if ($access{'allow'} && $config{'allow_file'}) {
} }
# If there is an init script that runs an atd server, show status # If there is an init script that runs an atd server, show status
if (&foreign_available("init")) { my ($init, $r, $atboot) = &get_init_status();
&foreign_require("init"); if ($access{'stop'} && $init) {
my $init = defined(&get_init_name) ? &get_init_name() : undef; print &ui_hr();
if ($access{'stop'} && $init) { print &ui_buttons_start();
print &ui_hr();
print &ui_buttons_start();
# Running now? # Running now?
my $r = &init::status_action($init); my $r = &init::status_action($init);
if ($r == 1) { if ($r == 1) {
print &ui_buttons_row("stop.cgi", $text{'index_stop'}, print &ui_buttons_row("stop.cgi", $text{'index_stop'},
$text{'index_stopdesc'}); $text{'index_stopdesc'});
}
elsif ($r == 0) {
print &ui_buttons_row("start.cgi", $text{'index_start'},
$text{'index_startdesc'});
}
# Start at boot?
my $atboot = &init::action_status($init);
print &ui_buttons_row("bootup.cgi", $text{'index_boot'},
$text{'index_bootdesc'}, undef,
&ui_radio("boot", $atboot == 2 ? 1 : 0,
[ [ 1, $text{'yes'} ],
[ 0, $text{'no'} ] ]));
print &ui_buttons_end();
} }
elsif ($r == 0) {
print &ui_buttons_row("start.cgi", $text{'index_start'},
$text{'index_startdesc'});
}
# Start at boot?
my $atboot = &init::action_status($init);
print &ui_buttons_row("bootup.cgi", $text{'index_boot'},
$text{'index_bootdesc'}, undef,
&ui_radio("boot", $atboot == 2 ? 1 : 0,
[ [ 1, $text{'yes'} ],
[ 0, $text{'no'} ] ]));
print &ui_buttons_end();
} }
&ui_print_footer("/", $text{'index'}); &ui_print_footer("/", $text{'index'});