diff options
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | lib/puppet/provider/user/useradd.rb | 6 | ||||
| -rwxr-xr-x | test/ral/providers/user/useradd.rb | 6 |
3 files changed, 8 insertions, 8 deletions
@@ -1,3 +1,7 @@ +(elmo) + Fixing #553; -M is no longer added when home directories are being + managed. + 0.22.2 (grover) Users can now manage their home directories, using the managehome parameter, partially using patches provided by Tim Stoop and diff --git a/lib/puppet/provider/user/useradd.rb b/lib/puppet/provider/user/useradd.rb index d88417216..21c42f2e9 100644 --- a/lib/puppet/provider/user/useradd.rb +++ b/lib/puppet/provider/user/useradd.rb @@ -38,12 +38,6 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ cmd << flag(property) << value end end - # stupid fedora - case Facter["operatingsystem"].value - when "Fedora", "RedHat": - cmd << "-M" - else - end if @model.allowdupe? cmd << "-o" diff --git a/test/ral/providers/user/useradd.rb b/test/ral/providers/user/useradd.rb index 48a110446..e3f2183ac 100755 --- a/test/ral/providers/user/useradd.rb +++ b/test/ral/providers/user/useradd.rb @@ -102,6 +102,8 @@ class UserAddProviderTest < PuppetTest::TestCase "useradd was not called") assert(params.include?("-m"), "Did not add -m when managehome was in affect") + assert(! params.include?("-M"), + "Added -M when managehome was in affect") true end @@ -123,8 +125,8 @@ class UserAddProviderTest < PuppetTest::TestCase assert(params.include?("-M"), "Did not add -M on Red Hat") end - assert(! params.include?("-m"), - "Added -m when managehome was disabled") + assert(! params.include?("-m"), + "Added -m when managehome was disabled") true end |