author | Drew Fisher <drew.fisher@oracle.com> |
Fri, 30 May 2014 08:19:47 -0700 | |
branch | s11-update |
changeset 3151 | 0dbc999aeec2 |
permissions | -rw-r--r-- |
3151
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
1 |
In-house patch to fix upstream bug PUP-2509 |
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
2 |
https://tickets.puppetlabs.com/browse/PUP-2509 |
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
3 |
Patch has been submitted upstream but not yet accepted. |
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
4 |
|
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
5 |
--- puppet-3.4.1/lib/puppet/provider/service/smf.rb.orig 2014-05-29 08:23:38.214504274 -0600 |
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
6 |
+++ puppet-3.4.1/lib/puppet/provider/service/smf.rb 2014-05-29 08:23:51.968114765 -0600 |
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
7 |
@@ -32,7 +32,7 @@ |
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
8 |
end |
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
9 |
|
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
10 |
def self.instances |
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
11 |
- svcs.split("\n").select{|l| l !~ /^legacy_run/ }.collect do |line| |
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
12 |
+ svcs("-H").split("\n").select{|l| l !~ /^legacy_run/ }.collect do |line| |
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
13 |
state,stime,fmri = line.split(/\s+/) |
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
14 |
status = case state |
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
15 |
when /online/; :running |