Merge branch '2.6.next' into 2.6.x

* 2.6.next: (102 commits)
  (#5073) Download plugins even if you're filtering on tags
  Fix #5610: Prevent unnecessary RAL lookups
  Revert "Merge branch 'ticket/2.6.x/5605' of git://github.com/stschulte/puppet into 2.6.next"
  (#6723) Fix withenv environment restoration bug
  (#6689) Remove extraneous include of Puppet::Util in InventoryActiveRecord
  Remove extra trailing whitespace from lib/puppet/resource.rb
  (#5428) More fully "stub" Puppet::Resource::Reference for use with storedconfigs
  (#6707) Fix typo in rest_authconfig.rb
  (#6689) Make inventory_active_record terminus search quickly
  (#5392) Give a better error when realizing a non-existant resource
  (#2645) Adding a less-stubby test to verify the "system" attribute's behavior
  maint: Remove serialization of InventoryFact values
  maint: Rename InventoryHost to InventoryNode
  Fixed #2645 - Added support for creating system users
  maint: Remove spec run noise
  maint:Refactor of mount provider integration tests
  (#6338) Support searching on metadata in InventoryActiveRecord terminus
  (#6338) Implement search for InventoryActiveRecord facts terminus
  (#6338) Add an InventoryActiveRecord terminus for Facts
  Added integration tests for the mount provider
  ...

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/puppet/provider/user/useradd.rb b/lib/puppet/provider/user/useradd.rb
index ba406cc63..b87971738 100644
--- a/lib/puppet/provider/user/useradd.rb
+++ b/lib/puppet/provider/user/useradd.rb
@@ -19,7 +19,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     value !~ /\s/
   end
 
-  has_features :manages_homedir, :allows_duplicates, :manages_expiry
+  has_features :manages_homedir, :allows_duplicates, :manages_expiry, :system_users
 
   has_features :manages_passwords, :manages_password_age if Puppet.features.libshadow?
 
@@ -46,6 +46,10 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     cmd
   end
 
+  def check_system_users
+    @resource.system? ? ["-r"] : []
+  end
+
   def add_properties
     cmd = []
     Puppet::Type.type(:user).validproperties.each do |property|
@@ -66,6 +70,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     cmd += check_allow_dup
     cmd += check_manage_home
     cmd += check_manage_expiry
+    cmd += check_system_users
     cmd << @resource[:name]
   end