RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

marsadm: split set-systemd-unit into phases

This commit is contained in:
Thomas Schoebel-Theuer 2020-11-17 18:28:58 +01:00
parent 0c3e7682ba
commit ff1a89bc1b
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
userspace/marsadm
View File

@ -1971,7 +1971,7 @@ sub _get_default_unit {
return $found; return $found;
} }
sub set_systemd_unit { sub set_systemd_unit_phase1 {
my ($cmd, $res, $start_name, $stop_name) = @_; my ($cmd, $res, $start_name, $stop_name) = @_;
ldie "Start unit name is undefined\n" unless defined($start_name); ldie "Start unit name is undefined\n" unless defined($start_name);
# typically, this matches to capital DEFAULT # typically, this matches to capital DEFAULT
@ -2028,8 +2028,14 @@ sub set_systemd_unit {
_create_delete($unit_stop_path); _create_delete($unit_stop_path);
_create_delete($want_path); _create_delete($want_path);
} }
return 0;
}
sub set_systemd_unit_phase2 {
my ($cmd, $res) = @_;
finish_links(); finish_links();
_systemd_trigger($cmd, 1); _systemd_trigger($cmd, 1);
return 0;
} }
################################################################## ##################################################################
@ -8679,7 +8685,13 @@ my %cmd_table =
"Please read mars-user-manual.pdf on this.", "Please read mars-user-manual.pdf on this.",
"When <stop_unit_name> is omitted, it will be treated equal to", "When <stop_unit_name> is omitted, it will be treated equal to",
"<start_unit_name>.", "<start_unit_name>.",
\&set_systemd_unit, "You may also use special keywords like DEFAULT, please read the manuals.",
"PARALLEL",
"FORK",
\&set_systemd_unit_phase1,
"set links",
\&set_systemd_unit_phase2,
"trigger systemd",
], ],
"get-systemd-unit" "get-systemd-unit"
=> [ => [
@ -10086,6 +10098,13 @@ if (ref($func) eq "ARRAY") {
my $memb_func = shift @list; my $memb_func = shift @list;
# check whether fork() is possible # check whether fork() is possible
if ($memb_func) { if ($memb_func) {
if ($memb_func eq "PARALLEL") {
if ($parallel < -99) {
lprint "Treating as --parallel=0\n" if $verbose;
$parallel = 0;
}
next;
}
if ($memb_func eq "FORK") { if ($memb_func eq "FORK") {
$memb_func = shift @list; $memb_func = shift @list;
# check whether fork() is requested # check whether fork() is requested