Commit 3dc65625 authored by Avi Drissman's avatar Avi Drissman Committed by Commit Bot

Remove obsolete Keystone promotion code

Remove code from Chrome that works around Keystone bugs that were
fixed long, long ago.

In addition, remove a reference to a feature request in Keystone that
was WONTFIXed long ago.

Bug: b/2285921, b/2289908, b/2290009
Change-Id: I5eb3f6ee4f4eb79366e5c86c3eed20971d379376
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2106875Reviewed-by: default avatarMark Mentovai <mark@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#750974}
parent c6272366
......@@ -930,22 +930,14 @@ NSString* const kVersionKey = @"KSVersion";
// the system level so all users can share the data as part of the ticket
// promotion.
//
// It will also ensure that the Keystone system ticket store is in a usable
// state for all users on the system. Ideally, Keystone's installer or
// another part of Keystone would handle this. The underlying problem is
// http://b/2285921, and it causes http://b/2289908, which this workaround
// addresses.
//
// This is run synchronously, which isn't optimal, but
// -[KSRegistration promoteWithParameters:authorization:] is currently
// synchronous too, and this operation needs to happen before that one.
//
// TODO(mark): Make asynchronous. That only makes sense if the promotion
// operation itself is asynchronous too. http://b/2290009. Hopefully,
// the Keystone promotion code will just be changed to do what preflight
// now does, and then the preflight script can be removed instead.
// However, preflight operation (and promotion) should only be asynchronous
// if the synchronous parameter is NO.
// Hopefully, the Keystone promotion code will just be changed to do what
// preflight now does, and then the preflight script can be removed instead.
// However, preflight operation (and promotion) should only be asynchronous if
// the synchronous parameter is NO.
NSString* preflightPath =
[base::mac::FrameworkBundle()
pathForResource:@"keystone_promote_preflight"
......
......@@ -16,9 +16,6 @@
# user's ID, but the effective user ID set to 0 (root). bash -p is used on
# the first line to prevent bash from setting the effective user ID to the
# real user ID (dropping root privileges).
#
# TODO(mark): Remove this script when able. See http://b/2285921 and
# http://b/2289908.
set -e
......@@ -68,30 +65,4 @@ if [ ${#} -eq 2 ] ; then
fi
OWNER_GROUP="root:admin"
CHMOD_MODE="a+rX,u+w,go-w"
LIB_GOOG="/Library/Google"
if [ -d "${LIB_GOOG}" ] ; then
# Just work with the directory. Don't do anything recursively here, so as
# to leave other things in /Library/Google alone.
chown -h "${OWNER_GROUP}" "${LIB_GOOG}" >& /dev/null
chmod -h "${CHMOD_MODE}" "${LIB_GOOG}" >& /dev/null
LIB_GOOG_GSU="${LIB_GOOG}/GoogleSoftwareUpdate"
if [ -d "${LIB_GOOG_GSU}" ] ; then
chown -Rh "${OWNER_GROUP}" "${LIB_GOOG_GSU}" >& /dev/null
chmod -R "${CHMOD_MODE}" "${LIB_GOOG_GSU}" >& /dev/null
# On the Mac, or at least on HFS+, symbolic link permissions are
# significant, but chmod -R and -h can't be used together. Do another
# pass to fix the permissions on any symbolic links.
find "${LIB_GOOG_GSU}" -type l -exec chmod -h "${CHMOD_MODE}" {} + >& \
/dev/null
# TODO(mark): If GoogleSoftwareUpdate.bundle is missing, dump TicketStore
# too?
fi
fi
exit 0
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment