* Test fix for the issue #379

Signed-off-by: digimer <mkelly@alteeve.ca>
main
digimer 1 year ago
parent f57ab1a78c
commit 9a5e617a2d
  1. 3
      anvil.spec.in
  2. 3
      tools/anvil-update-system

@ -256,7 +256,8 @@ getent passwd %{suiapi} >/dev/null \
--user-group \ --user-group \
%{suiapi} %{suiapi}
if [ $1 -gt 1 ]; then # >1=Upgrade # Check to see if we're updating.
if grep -q apache /etc/passwd; then
# Disable and stop apache to free the port. # Disable and stop apache to free the port.
systemctl disable --now httpd.service systemctl disable --now httpd.service
# Transfer files owned by apache to Striker UI API user. # Transfer files owned by apache to Striker UI API user.

@ -562,7 +562,7 @@ WHERE
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { installed_kernel => $installed_kernel }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { installed_kernel => $installed_kernel }});
# Get the running kernel # Get the running kernel
$shell_call = $anvil->data->{path}{exe}{uname}." -r"; $shell_call = $anvil->data->{path}{exe}{uname}." -r";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { shell_call => $shell_call }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { shell_call => $shell_call }});
(my $active_kernel, $return_code) = $anvil->System->call({shell_call => $shell_call}); (my $active_kernel, $return_code) = $anvil->System->call({shell_call => $shell_call});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
@ -583,6 +583,7 @@ WHERE
if (($package_changes) && ($anvil->data->{switches}{reboot})) if (($package_changes) && ($anvil->data->{switches}{reboot}))
{ {
# Reboot needed # Reboot needed
$anvil->data->{sys}{reboot} = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 'sys::reboot' => $anvil->data->{sys}{reboot} }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 'sys::reboot' => $anvil->data->{sys}{reboot} }});
my $reboot_needed = $anvil->System->reboot_needed({set => 1}); my $reboot_needed = $anvil->System->reboot_needed({set => 1});
} }

Loading…
Cancel
Save