Fixes the systemd? check for pre Linux 2.6.33 kernels

/proc/<pid>/comm was introduced in linux 2.6.33
jaymalasinha · Sep 15, 2016 · 15df350 · 15df350
1 parent ba19837
commit 15df350
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/chef/sugar/init.rb b/lib/chef/sugar/init.rb
@@ -25,7 +25,8 @@ module Init
       # @return [Boolean]
       #
       def systemd?(node)
-        IO.read('/proc/1/comm').chomp == 'systemd'
+        file = '/proc/1/comm'
+        File.exist?(file) && IO.read(file).chomp == 'systemd'
       end
 
       #

diff --git a/spec/unit/chef/sugar/init_spec.rb b/spec/unit/chef/sugar/init_spec.rb
@@ -22,13 +22,22 @@
         .and_return("systemd")
 
       node = {}
-      expect(described_class.systemd?(node)).to be true 
+      expect(described_class.systemd?(node)).to be true
     end
 
     it 'is false when /proc/1/comm is not systemd' do
       node = {}
       expect(described_class.systemd?(node)).to be false
     end
+
+    it 'is false when /proc/1/comm does not exist' do
+      allow(File).to receive(:exist?)
+        .with("/proc/1/comm")
+        .and_return(false)
+
+      node = {}
+      expect(described_class.systemd?(node)).to be false
+    end
   end
 
   describe '#upstart?' do