entd: move opencryptoki initialization out of entd

bin/entdwife.sh

 #!/bin/sh
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This script is temporary front-end to entd.  It validates the policy's
 # signature before starting the daemon.  If the signing certificate or
 # signature to not validate, then this script will log an error to syslog
 # and exit without starting entd.
 #
@@ skipping 251 matching lines @@
     return 1
   fi
 
   local root_ca_option=""
   if [ -f "$extension/$ROOT_CA_FILE" ]; then
     root_ca_option="--root-ca-file=$extension/$ROOT_CA_FILE"
   fi
 
   local extid="$(basename $(dirname "$extension"))"
 
+  local cryptohome_flag=""
+  if [ -r "/home/chronos/.cryptohome-init-pkcs11" ]; then
+    cryptohome_flag="--cryptohome-init-pkcs11"
+  fi
   exec "$FLAGS_entd" --utility="$FLAGS_utility" "$root_ca_option" \
     --policy="$extension/policy.js" --manifest="$extension/manifest.json" \
-    --username="$FLAGS_username" --callback-origin=chrome-extension://"$extid"
+    --username="$FLAGS_username" --callback-origin=chrome-extension://"$extid" \
+    $cryptohome_flag
 }
 
 cmd_disapprove() {
   if [ -f "$FLAGS_user_var/$APPROVED_CA" ]; then
     log "Removing enterprise certificate authority"
     rm -f "$FLAGS_user_var/$APPROVED_CA"
   else
     log "No enterprise certificate authority has been approved."
   fi
 }
@@ skipping 403 matching lines @@
 }
 EOF
 
   "$FLAGS_entd" --policy="$scriptfile" --manifest="$extension/manifest.json" \
     --username=user@example.com --allow-dirty-exit 2>/dev/null
 
   rm "$scriptfile"
 }
 
 main "$@"