bin/entdwife.sh - Issue 6821025: entd: move opencryptoki initialization out of entd

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: bin/entdwife.sh

Issue 6821025: entd: move opencryptoki initialization out of entd (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/entd.git@master

Patch Set: switch to using a flag to expect cryptohome to init pkcs11 Created 9 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: bin/entdwife.sh

diff --git a/bin/entdwife.sh b/bin/entdwife.sh

index 8fd3aa9baede9196ffc9aacde4e72b51382bba06..b1297be54575ff6060c0e8fe99184c48c00aa4c3 100755

--- a/bin/entdwife.sh

+++ b/bin/entdwife.sh

@@ -269,9 +269,14 @@ cmd_start() {

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() {

« no previous file with comments | « base_policy/policy-utils.js ('k') | main.cc » ('j') | no next file with comments »