selinuxrelabel: Remove attempts to relabel /system

These are a no-op due to the additional block-device protection from
e18c0d508a
so get rid of them entirely. Any installing recovery (or equivalent
installation process) should handle the labeling of system components
on its own.

Change-Id: I14c50f08efa6f05b03fad4fbc404219cc504e1ff
TBD: Do we still want to label unlabeled files?
This commit is contained in:
Ricardo Cerqueira 2013-12-31 17:59:54 +00:00
parent d8d32bbeb7
commit cae5f24530

View File

@ -9,7 +9,6 @@ if [ ! -f /file_contexts ]; then
fi
LABELDATA=0
LABELSYS=0
LABELDALVIKCACHE=0
# Test /data
@ -19,25 +18,13 @@ if [ $? -eq 0 ]; then
LABELDATA=1
fi
# Recheck other files under /data
# Double-check other files under /data
ls -Z /data/misc/wifi/wpa_supplicant.conf | grep -q "wifi_"
if [ $? -eq 1 ]; then
$L "data is unlabeled, fixing..."
$L "data is mis-labeled, fixing..."
LABELDATA=1
fi
ls -Z /system/bin/surfaceflinger | grep -q unlabeled
if [ $? -eq 0 ]; then
$L "system is unlabeled, fixing... (You really should update your recovery)"
LABELSYS=1
fi
ls -Z /system/priv-app/GoogleServicesFramework.apk | grep -q unlabeled
if [ $LABELSYS = "0" -a $? -eq 0 ]; then
$L "Found unlabeled Google framework, fixing..."
LABELSYS=1
fi
ls -Zd /data/dalvik-cache | grep -q unlabeled
if [ $? -eq 0 ]; then
$L "dalvik-cache is unlabeled, fixing..."
@ -51,14 +38,6 @@ if [ $? -eq 0 ]; then
fi
if [ $LABELSYS = "1" ]; then
busybox mount -o remount,rw /system
$L "/system relabel starting..."
restorecon -R /system
$L "/system relabel complete"
busybox mount -o remount,ro /system
fi
if [ $LABELDATA = "1" ]; then
$L "/data relabel starting..."
restorecon -R /data