make.globals: usersync default, bug #477682

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b2781b1811ced05c1d9ba71e453e6281e620cb79..e509a52131e97a534e6351ab667fe36c0b234c89 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -12,6 +12,7 @@ portage-2.1.12.14
 ==================================
 
 * FEATURES=userpriv and usersandbox are enabled by default.
+* FEATURES=usersync is enabled by default.
 
 portage-2.1.12
 ==================================

diff --git a/cnf/make.globals b/cnf/make.globals
index d690864e3c190c19057b5f8521e33f9c3fe64609..c4ed900d95947c737c90b7177a63d6971d85b364 100644 (file)
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -57,7 +57,7 @@ FEATURES="assume-digests binpkg-logs
           config-protect-if-modified distlocks ebuild-locks
           fixlafiles merge-sync news parallel-fetch preserve-libs protect-owned
           sandbox sfperms strict unknown-features-warn unmerge-logs
-          unmerge-orphans userfetch userpriv usersandbox"
+          unmerge-orphans userfetch userpriv usersandbox usersync"
 
 # Ignore file collisions in /lib/modules since files inside this directory
 # are never unmerged, and therefore collisions must be ignored in order for