author | Kristina Tripp <Kristina.Tripp@oracle.com> |
Mon, 20 Oct 2014 13:13:15 -0700 | |
branch | s11u2-sru |
changeset 3407 | e5c7eb70e0b8 |
permissions | -rw-r--r-- |
3407
e5c7eb70e0b8
18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff
changeset
|
1 |
Patch for FACT-654 facter ldom.rb generates virtinfo usage error on Solaris 11.2 x86 |
e5c7eb70e0b8
18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff
changeset
|
2 |
Upstream bug: https://tickets.puppetlabs.com/browse/FACT-654 |
e5c7eb70e0b8
18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff
changeset
|
3 |
--- facter-2.1.0/lib/facter/ldom.rb.orig 2014-08-13 17:15:34.284330702 -0600 |
e5c7eb70e0b8
18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff
changeset
|
4 |
+++ facter-2.1.0/lib/facter/ldom.rb 2014-08-13 17:16:13.476092829 -0600 |
e5c7eb70e0b8
18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff
changeset
|
5 |
@@ -1,4 +1,6 @@ |
e5c7eb70e0b8
18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff
changeset
|
6 |
-if Facter.value(:kernel) == 'SunOS' and Facter::Core::Execution.which('virtinfo') |
e5c7eb70e0b8
18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff
changeset
|
7 |
+if Facter.value(:kernel) == 'SunOS' and |
e5c7eb70e0b8
18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff
changeset
|
8 |
+ Facter.value(:hardwareisa) == 'sparc' and |
e5c7eb70e0b8
18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff
changeset
|
9 |
+ Facter::Core::Execution.which('virtinfo') |
e5c7eb70e0b8
18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff
changeset
|
10 |
virtinfo = Facter::Core::Execution.exec('virtinfo -ap') |
e5c7eb70e0b8
18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff
changeset
|
11 |
|
e5c7eb70e0b8
18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff
changeset
|
12 |
# Convert virtinfo parseable output format to array of arrays. |