Stephen Smalley avatar Stephen Smalley committed baf0d5b Merge with conflicts

Merge branch 'master' into seandroid

Conflicts:
init.grouper.rc
sepolicy/system.te

Comments (0)

Files changed (2)

     write /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor interactive
     write /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor interactive
     write /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor interactive
+    restorecon /sys/devices/system/cpu
     restorecon /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
     restorecon /sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay
     restorecon /sys/devices/system/cpu/cpufreq/interactive/boost

sepolicy/system.te

 allow system sysfs_devices_system_cpu:file w_file_perms;
 allow system sysfs_devices_system_cpu:dir r_dir_perms;
 allow system elan_ip_device:chr_file rw_file_perms;
-allow system usb_device:dir r_dir_perms;
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.