michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-17 12:12:17 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix create_launchd_agent to support optional load parameter
Some checks are pending
webmin.dev: webmin/webmin / build (push) Waiting to run
Details

Browse Source 
https://github.com/webmin/authentic-theme/issues/1729#issuecomment-3899950457
This commit is contained in:
Ilia Ross
2026-02-16 20:15:52 +02:00
parent 2eb2be2318
commit f778af84a0
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
init/init-lib.pl
View File

@@ -2816,14 +2816,15 @@ foreach my $a (@rv) {
return @rv;
}
=head2 create_launchd_agent(name, start-script, boot-flag)
=head2 create_launchd_agent(name, start-script, boot-flag, [load-now])
Creates a new my launchd agent
=cut
sub create_launchd_agent
{
my ($name, $start, $boot) = @_;
my ($name, $start, $boot, $load) = @_;
$load = 1 if (!defined($load));
my $file = "/Library/LaunchDaemons/".$name.".plist";
my $plist = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n".
"<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n".
@@ -2846,8 +2847,10 @@ $plist .= "</plist>\n";
&open_lock_tempfile(PLIST, ">$file");
&print_tempfile(PLIST, $plist);
&close_tempfile(PLIST);
my $out = &backquote_logged("launchctl load ".quotemeta($file)." 2>&1");
&error("Failed to load plist : $out") if ($?);
if ($load) {
my $out = &backquote_logged("launchctl load ".quotemeta($file)." 2>&1");
&error("Failed to load plist : $out") if ($?);
}
}
=head2 delete_launchd_agent(name)

4
init/updateboot.pl
View File

@@ -69,12 +69,12 @@ if ($product) {
&delete_launchd_agent($name);
&create_launchd_agent($name,
"$config_directory/.start-init --nofork",
$boot);
$boot, 0);
}
elsif ($want_boot) {
&create_launchd_agent($name,
"$config_directory/.start-init --nofork",
1);
1, 0);
}
}
elsif (-d "/etc/init.d") {