summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2009-02-03 21:32:16 +1100
committerJames Turnbull <james@lovedthanlost.net>2009-02-03 21:32:16 +1100
commiteffb82f0815f19e3ec933e9e7465d4fc2ee1e7c8 (patch)
treed2284e2a63b2f350e6f88d5f8b9f72f61bb4f824
parentccafc00614200d3af301e0dd42332056fe288da3 (diff)
downloadfacter-effb82f0815f19e3ec933e9e7465d4fc2ee1e7c8.tar.gz
facter-effb82f0815f19e3ec933e9e7465d4fc2ee1e7c8.tar.xz
facter-effb82f0815f19e3ec933e9e7465d4fc2ee1e7c8.zip
Cleaner fix for #1926
-rw-r--r--lib/facter/network.rb2
-rw-r--r--lib/facter/util/ip.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/facter/network.rb b/lib/facter/network.rb
index b7e335d..513282a 100644
--- a/lib/facter/network.rb
+++ b/lib/facter/network.rb
@@ -4,7 +4,7 @@ Facter::Util::IP.get_interfaces.each do |interface|
Facter.add("network_" + Facter::Util::IP.alphafy(interface)) do
setcode do
- Facter::Util::IP.get_network_value(interface).to_s
+ Facter::Util::IP.get_network_value(interface)
end
end
end
diff --git a/lib/facter/util/ip.rb b/lib/facter/util/ip.rb
index 6c01033..1f07f58 100644
--- a/lib/facter/util/ip.rb
+++ b/lib/facter/util/ip.rb
@@ -150,7 +150,7 @@ module Facter::Util::IP
if ipaddress && netmask
ip = IPAddr.new(ipaddress, Socket::AF_INET)
subnet = IPAddr.new(netmask, Socket::AF_INET)
- network = ip.mask(subnet.to_s)
+ network = ip.mask(subnet.to_s).to_s
end
end
end