From 25979e03da1ed03ebf0d8900ab6d4bb64019735d Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Thu, 18 Nov 2010 11:32:32 -0500
Subject: Don't relabel random files; this shouldn't happen any more.

Also, merge blocks on identical conditions.
---
 systemd/fedora-autorelabel | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'systemd')

diff --git a/systemd/fedora-autorelabel b/systemd/fedora-autorelabel
index f5e4db29..6148cd26 100755
--- a/systemd/fedora-autorelabel
+++ b/systemd/fedora-autorelabel
@@ -60,21 +60,10 @@ relabel_selinux() {
 
 [ -z "${cmdline}" ] && cmdline=$(cat /proc/cmdline)
 
-# Clean up SELinux labels
-if [ -n "$SELINUX_STATE" ]; then
-   restorecon /etc/mtab /etc/ld.so.cache /etc/blkid/blkid.tab /etc/resolv.conf >/dev/null 2>&1
-fi
-
-# If relabeling, relabel mount points.
-if [ -n "$SELINUX_STATE" -a "$READONLY" != "yes" ]; then
-    if strstr "$cmdline" autorelabel || [ -f /.autorelabel ] ; then
-	restorecon $(awk '!/^#/ && $4 !~ /noauto/ && $2 ~ /^\// { print $2 }' /etc/fstab) >/dev/null 2>&1
-    fi
-fi
-
 # Check to see if a full relabel is needed
 if [ -n "$SELINUX_STATE" -a "$READONLY" != "yes" ]; then
     if strstr "$cmdline" autorelabel || [ -f /.autorelabel ] ; then
+	restorecon $(awk '!/^#/ && $4 !~ /noauto/ && $2 ~ /^\// { print $2 }' /etc/fstab) >/dev/null 2>&1
 	relabel_selinux
     fi
 else
-- 
cgit v1.2.1