* Removed enabling anvil-safe-start out of the RPM and into anvil-join-anvil.

Signed-off-by: digimer <mkelly@alteeve.ca>
main
digimer 2 years ago
parent 89eae7098e
commit 83a527f4fa
  1. 2
      anvil.spec.in
  2. 1
      share/words.xml
  3. 9
      tools/anvil-join-anvil

@ -302,8 +302,6 @@ then
rm -f /etc/anvil/type.dr rm -f /etc/anvil/type.dr
fi fi
touch /etc/anvil/type.node touch /etc/anvil/type.node
echo "Enabling anvil-safe-start"
systemctl enable --now anvil-safe-start.service
%pre dr %pre dr

@ -1531,6 +1531,7 @@ Note: This is a permanent action! If you protect this server again later, a full
--install-media - File name or file UUID. Available discs are:]]></key> --install-media - File name or file UUID. Available discs are:]]></key>
<key name="job_0461"><![CDATA[ > File name: [#!variable!name!#], file UUID: [#!variable!uuid!#], size: [#!variable!size!#]]]></key> <key name="job_0461"><![CDATA[ > File name: [#!variable!name!#], file UUID: [#!variable!uuid!#], size: [#!variable!size!#]]]></key>
<key name="job_0462"><![CDATA[ --driver-disc - (optional) A driver disc to be added as a second optical drive. Valid options are above.]]></key> <key name="job_0462"><![CDATA[ --driver-disc - (optional) A driver disc to be added as a second optical drive. Valid options are above.]]></key>
<key name="job_0463">Enabling the enable-safe-start daemon.</key>
<!-- Log entries --> <!-- Log entries -->
<key name="log_0001">Starting: [#!variable!program!#].</key> <key name="log_0001">Starting: [#!variable!program!#].</key>

@ -66,6 +66,15 @@ configure_pacemaker($anvil);
# Configure DRBD # Configure DRBD
configure_drbd($anvil); configure_drbd($anvil);
# Enable anvil-safe-start
if (1)
{
my ($return_code) = $anvil->System->enable_daemon({daemon => "anvil-safe-start.service"});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { return_code => $return_code }});
update_progress($anvil, (99, "job_0094,!!daemon!anvil-safe-start.service!!");
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "job_0094", variables => { daemon => "anvil-safe-start.service" }});
}
update_progress($anvil, 100, "job_0128"); update_progress($anvil, 100, "job_0128");
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "job_0128"}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "job_0128"});

Loading…
Cancel
Save