Merge pull request #595 from simondeziel/explicit-trust-token-detection

integration: fix detection of explicit_trust_token API extension

integration/run-integration-tests

@@ -18,7 +18,7 @@ fi
 # Make sure a client.{crt,key} exist by trying to add a bogus remote
 lxc remote add foo 127.0.0.1:1234 2>/dev/null || true
 
-if ! lxc query /1.0 | grep -q '"explicit_trust_token"$'; then
+if ! lxc info | grep -qwF explicit_trust_token; then
     lxc config set core.trust_password password
 fi
 lxc config set core.https_address 127.0.0.1
@@ -64,7 +64,7 @@ for cert in $(comm -13 "${OLD_TRUST_LIST}" "${NEW_TRUST_LIST}"); do
 done
 rm -f "${OLD_TRUST_LIST}" "${NEW_TRUST_LIST}"
 
-if ! lxc query /1.0 | grep -q '"explicit_trust_token"$'; then
+if ! lxc info | grep -qwF explicit_trust_token; then
     lxc config unset core.trust_password || true
 fi
 lxc config unset core.https_address || true