Merge "init: allow init to restorecon on block devices and their symlinks" am: 2e934f7f

am: 4afe2e28

Change-Id: I3be985c26ba95bb8d8a44084a918bf6714d4ed6c

public/init.te

@@ -27,9 +27,11 @@ allow init random_device:chr_file relabelto;
 # /dev/device-mapper, /dev/block(/.*)?
 allow init tmpfs:{ chr_file blk_file } relabelfrom;
 allow init tmpfs:blk_file getattr;
-allow init block_device:{ dir blk_file } relabelto;
+allow init block_device:{ dir blk_file lnk_file } relabelto;
 allow init dm_device:{ chr_file blk_file } relabelto;
 allow init kernel:fd use;
+# restorecon for early mount device symlinks
+allow init tmpfs:lnk_file { getattr read relabelfrom };
 
 # setrlimit
 allow init self:capability sys_resource;