Skip to content

Commit

Permalink
Rename /var/lib/whitelist
Browse files Browse the repository at this point in the history
Chrome should use /var/lib/devicesettings. Currently this folder is just
a bind mount to /var/lib/whitelist, so we can already read from
devicesettings but to delete enrollment need to delete both folders. In
the future only devicesttings will exist.

Bug: b/187793661
Change-Id: I6172963fc26041b5917b7030b3a776f6f0e9f8d6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3085723
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Miriam Polzer <mpolzer@google.com>
Cr-Commit-Position: refs/heads/main@{#914685}
  • Loading branch information
miriampolzer authored and Chromium LUCI CQ committed Aug 24, 2021
1 parent afd7a0c commit dfb1933
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion chromeos/dbus/constants/dbus_paths.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ constexpr base::FilePath::CharType kDefaultUserPolicyKeysDir[] =
FILE_PATH_LITERAL("/run/user_policy");

constexpr base::FilePath::CharType kOwnerKeyFileName[] =
FILE_PATH_LITERAL("/var/lib/whitelist/owner.key");
FILE_PATH_LITERAL("/var/lib/devicesettings/owner.key");

constexpr base::FilePath::CharType kInstallAttributesFileName[] =
FILE_PATH_LITERAL("/run/lockbox/install_attributes.pb");
Expand Down
2 changes: 1 addition & 1 deletion docs/enterprise/enrollment.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on the login screen), if it is not disabled via device policy.
Developers can reset ownership by running following commands as root in shell:
```
pkill -9 chrome
rm -rf /home/chronos/Local\ State /var/lib/whitelist /home/.shadow
rm -rf /home/chronos/Local\ State /var/lib/whitelist /var/lib/devicesettings /home/.shadow
rm /home/chronos/.oobe_completed
crossystem clear_tpm_owner_request=1
reboot
Expand Down

0 comments on commit dfb1933

Please sign in to comment.