lib/specinfra/command/openbsd.rb in specinfra-1.27.5 vs lib/specinfra/command/openbsd.rb in specinfra-2.0.0.beta1

@@ -1,10 +1,10 @@
 module SpecInfra
   module Command
     class OpenBSD < Base
       def check_enabled(service, level=3)
-        "rcctl status #{escape(service)}"
+        "egrep '(#{escape(service)}_flags=|^pkg_scripts=\"(.*)#{escape(service)}(.*)\")' /etc/rc.conf.local | grep -v \=NO"
       end
 
       def check_file_md5checksum(file, expected)
         regexp = "^#{expected}"
         "cksum -qa md5 #{escape(file)} | grep -w #{escape(regexp)}"
@@ -74,10 +74,10 @@
 #      def check_routing_table(destination)
 #        "route -n show -gateway | egrep '(^default|#{destination})' | head -1"
 #      end
 
       def check_running(service)
-        "rcctl check #{escape(service)}"
+        "/etc/rc.d/#{escape(service)} status"
       end
 
       def get_mode(file)
         "stat -f%Lp #{escape(file)}"
       end