From 9b4218292e06ea4d0b4c07b272653dcf52a24142 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Fri, 1 Aug 2008 09:23:25 -0500 Subject: Modified the operatingsystem fact for Debian so it looks in /etc/debian_version instead of /proc/version. Applied patch by marthag. Signed-off-by: Luke Kanies --- CHANGELOG | 3 +++ lib/facter/operatingsystemrelease.rb | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index de4dee9..c52dccf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,7 @@ 1.5.x: + Modified the operatingsystem fact for Debian so it looks in + /etc/debian_version instead of /proc/version. + Fixes #1467 - macaddress not set on Ubuntu 1.5.0: diff --git a/lib/facter/operatingsystemrelease.rb b/lib/facter/operatingsystemrelease.rb index 843dfdb..7aeeb1e 100644 --- a/lib/facter/operatingsystemrelease.rb +++ b/lib/facter/operatingsystemrelease.rb @@ -41,10 +41,7 @@ end Facter.add(:operatingsystemrelease) do confine :operatingsystem => %w{Debian} setcode do - release = Facter::Util::Resolution.exec('cat /proc/version') - if release =~ /\(Debian (\d+.\d+).\d+-\d+\)/ - $1 - end + release = Facter::Util::Resolution.exec('cat /etc/debian_version') end end -- cgit