summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper Lievisse Adriaanse <jasper@humppa.nl>2016-12-25 13:43:29 +0100
committerBrian Coca <bcoca@users.noreply.github.com>2017-01-02 17:02:22 -0500
commit0c0defb63da1c9ee9929923116a223a4eaa1b45a (patch)
tree149c36518661acc7d629b0d64b71a6dcb93558cb
parentb9e4a4dede6eb99eceac2c9eeb8f4e78453647ec (diff)
downloadansible-0c0defb63da1c9ee9929923116a223a4eaa1b45a.tar.gz
Recognize pkgin when installed in the global zone on SmartOS
-rw-r--r--lib/ansible/module_utils/facts.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ansible/module_utils/facts.py b/lib/ansible/module_utils/facts.py
index 92d1d5b6fa..066143defe 100644
--- a/lib/ansible/module_utils/facts.py
+++ b/lib/ansible/module_utils/facts.py
@@ -145,6 +145,7 @@ class Facts(object):
{ 'path' : '/bin/opkg', 'name' : 'opkg' },
{ 'path' : '/usr/pkg/bin/pkgin', 'name' : 'pkgin' },
{ 'path' : '/opt/local/bin/pkgin', 'name' : 'pkgin' },
+ { 'path' : '/opt/tools/bin/pkgin', 'name' : 'pkgin' },
{ 'path' : '/opt/local/bin/port', 'name' : 'macports' },
{ 'path' : '/usr/local/bin/brew', 'name' : 'homebrew' },
{ 'path' : '/sbin/apk', 'name' : 'apk' },
@@ -2247,7 +2248,7 @@ class Darwin(Hardware):
class HurdHardware(LinuxHardware):
"""
GNU Hurd specific subclass of Hardware. Define memory and mount facts
- based on procfs compatibility translator mimicking the interface of
+ based on procfs compatibility translator mimicking the interface of
the Linux kernel.
"""
@@ -3016,7 +3017,7 @@ class NetBSDNetwork(GenericBsdIfconfigNetwork):
"""
platform = 'NetBSD'
- def parse_media_line(self, words, current_if, ips):
+ def parse_media_line(self, words, current_if, ips):
# example of line:
# $ ifconfig
# ne0: flags=8863<UP,BROADCAST,NOTRAILERS,RUNNING,SIMPLEX,MULTICAST> mtu 1500