Disabled calling striker-prep-database from the spec file, and enabled scancore.

Signed-off-by: Digimer <digimer@alteeve.ca>
main
Digimer 3 years ago
parent 91df8f1e70
commit 034c38fdeb
  1. 9
      anvil.spec.in
  2. 6
      tools/anvil-daemon

@ -237,6 +237,8 @@ systemctl enable chronyd.service
systemctl start chronyd.service systemctl start chronyd.service
systemctl enable anvil-daemon.service systemctl enable anvil-daemon.service
systemctl restart anvil-daemon.service systemctl restart anvil-daemon.service
systemctl enable scancore.service
systemctl restart scancore.service
%post striker %post striker
@ -252,9 +254,10 @@ then
systemctl enable gdm.service systemctl enable gdm.service
fi fi
echo "Preparing the database" ### This is handled by anvil-daemon now
striker-prep-database #echo "Preparing the database"
anvil-update-states #striker-prep-database
#anvil-update-states
# Touch the system type file. # Touch the system type file.
echo "Touching the system type file" echo "Touching the system type file"

@ -91,7 +91,11 @@ $anvil->System->_check_anvil_conf();
# Connect to the database(s). If we have no connections, we'll proceed anyway as one of the 'run_once' tasks # Connect to the database(s). If we have no connections, we'll proceed anyway as one of the 'run_once' tasks
# is to setup the database server. # is to setup the database server.
$anvil->Database->connect({check_if_configured => 1, check_for_resync => 1}); $anvil->Database->connect({
debug => 2,
check_if_configured => 1,
check_for_resync => 1,
});
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0132"}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0132"});
# If I have no databases, sleep for a second and then exit (systemd will restart us). # If I have no databases, sleep for a second and then exit (systemd will restart us).

Loading…
Cancel
Save