Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/ruby/facter/patches/facter-03-FACT-658.patch
author Kristina Tripp <Kristina.Tripp@oracle.com>
Thu, 04 Sep 2014 16:55:58 -0600
changeset 2068 4e371f01e40f
child 5860 afd31ba91ee9
permissions -rw-r--r--
18354422 facter cannot parse the output of GNU uptime 18960283 problem in UTILITY/PUPPET 18960296 Update Facter to 2.1.0 19357281 facter --help doesn't work 19402424 puppet error when no swap devices configured
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2068
4e371f01e40f 18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff changeset 
     1
 
Patch for FACT-658 facter doesn't parse gnu uptime output
4e371f01e40f 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-658
4e371f01e40f 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/util/uptime.rb.orig	2014-08-15 10:19:59.183717181 -0600
4e371f01e40f 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/util/uptime.rb	2014-08-15 10:44:49.611645182 -0600
4e371f01e40f 18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff changeset 
     5
 
@@ -76,6 +76,14 @@
4e371f01e40f 18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff changeset 
     6
 
   end
4e371f01e40f 18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff changeset 
     7
4e371f01e40f 18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff changeset 
     8
 
   def self.uptime_executable_cmd
4e371f01e40f 18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff changeset 
     9
 
-    "uptime"
4e371f01e40f 18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff changeset 
    10
 
+    if Facter.value(:kernel) == 'SunOS'
4e371f01e40f 18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff changeset 
    11
 
+      # Facter doesn't work with gnu uptime
4e371f01e40f 18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff changeset 
    12
 
+      # force use of /usr/bin/uptime
4e371f01e40f 18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff changeset 
    13
 
+      # in case user PATH has /usr/gnu/bin
4e371f01e40f 18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff changeset 
    14
 
+      # before /usr/bin
4e371f01e40f 18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff changeset 
    15
 
+      "/usr/bin/uptime"
4e371f01e40f 18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff changeset 
    16
 
+    else
4e371f01e40f 18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff changeset 
    17
 
+      "uptime"
4e371f01e40f 18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff changeset 
    18
 
+    end
4e371f01e40f 18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff changeset 
    19
 
   end
4e371f01e40f 18354422 facter cannot parse the output of GNU uptime
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff changeset 
    20
 
 end
upstream/oracle/userland-gate