summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/ohai/plugins/linux/selinux.rb3
-rw-r--r--spec/unit/plugins/linux/selinux_spec.rb4
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/ohai/plugins/linux/selinux.rb b/lib/ohai/plugins/linux/selinux.rb
index c12424f2..8cbb6a4d 100644
--- a/lib/ohai/plugins/linux/selinux.rb
+++ b/lib/ohai/plugins/linux/selinux.rb
@@ -51,8 +51,9 @@ Ohai.plugin(:Selinux) do
end
end
- key, val = line.split(%r{:?\s\s+}, 2)
+ key, val = line.split(/:?\s\s+/, 2)
next if key.nil?
+
unless key.start_with?("/")
key.downcase!
key.tr!(" ", "_")
diff --git a/spec/unit/plugins/linux/selinux_spec.rb b/spec/unit/plugins/linux/selinux_spec.rb
index 29545919..6f8ceef4 100644
--- a/spec/unit/plugins/linux/selinux_spec.rb
+++ b/spec/unit/plugins/linux/selinux_spec.rb
@@ -69,7 +69,7 @@ Controlling terminal: system_u:object_r:file_t
"/sbin/agetty" => "user_u:object_r:file_t",
"/sbin/init" => "user_u:object_r:file_t -> user_u:object_r:init_exec_t",
"/usr/sbin/sshd" => "user_u:object_r:file_t",
- "controlling_terminal" => "system_u:object_r:file_t"
+ "controlling_terminal" => "system_u:object_r:file_t",
},
"policy_booleans" => {
"secure_mode_policyload" => "off",
@@ -77,7 +77,7 @@ Controlling terminal: system_u:object_r:file_t
"process_contexts" => {
"/usr/sbin/sshd" => "system_u:base_r:base_t",
"current_context" => "user_u:base_r:admin_t",
- "init_context" => "system_u:system_r:init_t"
+ "init_context" => "system_u:system_r:init_t",
},
"status" => {
"current_mode" => "permissive",