author | Shawn Ferry <shawn.ferry@oracle.com> |
Mon, 28 Nov 2016 16:54:02 -0800 | |
changeset 7565 | 48aa82a0931f |
permissions | -rw-r--r-- |
7565
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
1 |
Merged with upstream PUP 4.9.0 |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
2 |
(PUP-6792) SMF should recursively enable services |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
3 |
https://tickets.puppetlabs.com/browse/PUP-6792 |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
4 |
|
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
5 |
diff --git a/lib/puppet/provider/service/smf.rb b/lib/puppet/provider/service/smf.rb |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
6 |
index be04a95..d006ca7 100644 |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
7 |
--- a/lib/puppet/provider/service/smf.rb |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
8 |
+++ b/lib/puppet/provider/service/smf.rb |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
9 |
@@ -80,7 +80,7 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
10 |
when :maintenance, :degraded |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
11 |
[command(:adm), :clear, @resource[:name]] |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
12 |
else |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
13 |
- [command(:adm), :enable, "-s", @resource[:name]] |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
14 |
+ [command(:adm), :enable, "-rs", @resource[:name]] |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
15 |
end |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
16 |
end |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
17 |