diff options
| author | jamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 18:41:00 +0000 |
|---|---|---|
| committer | jamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 18:41:00 +0000 |
| commit | e050411289bdac03ea2c45b8448ee6e812e6bae1 (patch) | |
| tree | 3604171bab86dfe74d3711363c181177997435b0 /remoting | |
| parent | 725e862d06e7b89e4d7fd753d9a90635c2035a90 (diff) | |
| download | chromium_src-e050411289bdac03ea2c45b8448ee6e812e6bae1.zip chromium_src-e050411289bdac03ea2c45b8448ee6e812e6bae1.tar.gz chromium_src-e050411289bdac03ea2c45b8448ee6e812e6bae1.tar.bz2 | |
Require an explicit command-line option from launchd.
Without an explicit command-line option to run the host, we can't
add functionality to the script because any version skew between
the web-app and host components could cause the host to be run at
the wrong time.
BUG=None
TEST=Manual
Review URL: https://chromiumcodereview.appspot.com/10384126
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136622 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/installer/mac/LaunchAgents/org.chromium.chromoting.plist | 1 | ||||
| -rwxr-xr-x | remoting/host/installer/mac/PrivilegedHelperTools/org.chromium.chromoting.me2me.sh | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/remoting/host/installer/mac/LaunchAgents/org.chromium.chromoting.plist b/remoting/host/installer/mac/LaunchAgents/org.chromium.chromoting.plist index a7ca612..3831649 100644 --- a/remoting/host/installer/mac/LaunchAgents/org.chromium.chromoting.plist +++ b/remoting/host/installer/mac/LaunchAgents/org.chromium.chromoting.plist @@ -16,6 +16,7 @@ <key>ProgramArguments</key> <array> <string>/Library/PrivilegedHelperTools/org.chromium.chromoting.me2me.sh</string> + <string>--run-from-launchd</string> </array> </dict> </plist> diff --git a/remoting/host/installer/mac/PrivilegedHelperTools/org.chromium.chromoting.me2me.sh b/remoting/host/installer/mac/PrivilegedHelperTools/org.chromium.chromoting.me2me.sh index 9e01d27..2a5845e 100755 --- a/remoting/host/installer/mac/PrivilegedHelperTools/org.chromium.chromoting.me2me.sh +++ b/remoting/host/installer/mac/PrivilegedHelperTools/org.chromium.chromoting.me2me.sh @@ -82,6 +82,9 @@ elif [[ "$1" = "--enable" ]]; then elif [[ "$1" = "--save-config" ]]; then echo $$ cat > "$CONFIG_FILE" -else +elif [[ "$1" = "--run-from-launchd" ]]; then run_host +else + echo $$ + exit 1 fi |