Revert "Add SELinux filesystem relabeling to init"

This reverts commit d2d1a7ffb1.

Revert "selinuxrelabel: Remove attempts to relabel /system"

This reverts commit cae5f24530.

Revert "Recheck /data for selinux labeling"

This reverts commit c4dcb16ca9.

Revert "selinuxrelabel: Add a check for dalvik-cache"

This reverts commit c7e9230614.

Revert "selinuxrelabel: Need to check in priv-app now"

This reverts commit 3013c99acb.

Revert "selinux: When adding userdata labels, do cache too"

This reverts commit 8994907baf.

Revert "selinux: Use a more reliable sentinel to flag /data labelling"

This reverts commit b52874de53.

Change-Id: I7779aaca3b0751ed74d525292681817182a0aa7f
gugelfrei
Ricardo Cerqueira 10 years ago
parent 4da88ceb96
commit 58154f365c

@ -96,10 +96,6 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \
vendor/cm/prebuilt/common/etc/init.d/90userinit:system/etc/init.d/90userinit
# SELinux filesystem labels
PRODUCT_COPY_FILES += \
vendor/cm/prebuilt/common/etc/init.d/50selinuxrelabel:system/etc/init.d/50selinuxrelabel
# CM-specific init file
PRODUCT_COPY_FILES += \
vendor/cm/prebuilt/common/etc/init.local.rc:root/init.cm.rc

@ -1,55 +0,0 @@
#!/system/bin/sh
L="log -p i -t SELinuxLabel"
# Bail out early if not on a SELinux build
getprop ro.build.selinux | grep -q 1 || exit
if [ ! -f /file_contexts ]; then
exit
fi
LABELDATA=0
LABELDALVIKCACHE=0
# Test /data
ls -Zd /data/system | grep -q unlabeled
if [ $? -eq 0 ]; then
$L "userdata is unlabeled, fixing..."
LABELDATA=1
fi
# Double-check other files under /data
ls -Z /data/misc/wifi/wpa_supplicant.conf | grep -q "wifi_"
if [ $? -eq 1 ]; then
$L "data is mis-labeled, fixing..."
LABELDATA=1
fi
ls -Zd /data/dalvik-cache | grep -q unlabeled
if [ $? -eq 0 ]; then
$L "dalvik-cache is unlabeled, fixing..."
LABELDALVIKCACHE=1
fi
ls -Zd /cache/dalvik-cache | grep -q unlabeled
if [ $? -eq 0 ]; then
$L "dalvik-cache is unlabeled, fixing..."
LABELDALVIKCACHE=1
fi
if [ $LABELDATA = "1" ]; then
$L "/data relabel starting..."
restorecon -R /data
$L "/data relabel complete"
$L "/cache relabel starting..."
restorecon -R /cache
$L "/cache relabel complete"
fi
if [ $LABELDALVIKCACHE = "1" ]; then
$L "dalvik-cache relabel starting..."
restorecon -R /data/dalvik-cache
restorecon -R /cache/dalvik-cache
$L "dalvik-cache relabel complete"
fi
Loading…
Cancel
Save