Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-11-11 07:34:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

bugfix: centos detection in docker centos:7.1.1503

Browse source 
It doesnt post the expected information in /etc/redhat-release:

    Derived from Red Hat Enterprise Linux 7.1 (Source)

Additionally in /etc/os-release:

    NAME="CentOS Linux"
	  VERSION="7 (Core)"
	  ...

Combine both files to fix the detection.
This commit is contained in:
Dominik Richter 2015-09-30 13:43:55 +02:00
parent 6703d1834d
commit 12888c8dad
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/vulcano/plugins/backend_detect_linux.rb
View file

@ -39,7 +39,13 @@ class Vulcano::Plugins::Backend
@platform[:release] = raw[/(\d\.\d\.\d)/, 1] @platform[:release] = raw[/(\d\.\d\.\d)/, 1]
elsif !(raw = get_config('/etc/redhat-release')).nil? elsif !(raw = get_config('/etc/redhat-release')).nil?
# TODO: Cisco # TODO: Cisco
@platform[:family] = redhatish_platform(raw) # TODO: fully investigate os-release and integrate it;
# here we just use it for centos
if !(osrel = get_config('/etc/os-release')).nil? && osrel =~ /centos/i
@platform[:family] = 'centos'
else
@platform[:family] = redhatish_platform(raw)
end
@platform[:release] = redhatish_version(raw) @platform[:release] = redhatish_version(raw)
elsif !(raw = get_config('/etc/system-release')).nil? elsif !(raw = get_config('/etc/system-release')).nil?
# Amazon Linux # Amazon Linux
@ -99,7 +105,9 @@ class Vulcano::Plugins::Backend
end end
def redhatish_version(conf) def redhatish_version(conf)
conf[/rawhide/i] ? conf[/((\d+) \(Rawhide\))/i, 1].downcase : conf[/release ([\d\.]+)/, 1] return conf[/((\d+) \(Rawhide\))/i, 1].downcase if conf[/rawhide/i]
return conf[/Linux ((\d+|\.)+)/i, 1] if conf[/derived from .*linux/i]
conf[/release ([\d\.]+)/, 1]
end end
def detect_linux def detect_linux