From 034c38fdebdd4498fceb10ff66f94afa74a19fc2 Mon Sep 17 00:00:00 2001 From: Digimer Date: Wed, 24 Nov 2021 00:55:02 -0500 Subject: [PATCH] Disabled calling striker-prep-database from the spec file, and enabled scancore. Signed-off-by: Digimer --- anvil.spec.in | 9 ++++++--- tools/anvil-daemon | 6 +++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/anvil.spec.in b/anvil.spec.in index d1952b3b..20e074fc 100644 --- a/anvil.spec.in +++ b/anvil.spec.in @@ -237,6 +237,8 @@ systemctl enable chronyd.service systemctl start chronyd.service systemctl enable anvil-daemon.service systemctl restart anvil-daemon.service +systemctl enable scancore.service +systemctl restart scancore.service %post striker @@ -252,9 +254,10 @@ then systemctl enable gdm.service fi -echo "Preparing the database" -striker-prep-database -anvil-update-states +### This is handled by anvil-daemon now +#echo "Preparing the database" +#striker-prep-database +#anvil-update-states # Touch the system type file. echo "Touching the system type file" diff --git a/tools/anvil-daemon b/tools/anvil-daemon index 1cb42c66..29142c78 100755 --- a/tools/anvil-daemon +++ b/tools/anvil-daemon @@ -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 # 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"}); # If I have no databases, sleep for a second and then exit (systemd will restart us).