commit 44c116d55f59b6b4839747620e0c6cd299f8e9f8
author Colin Cross <ccross@android.com> Wed Jan 30 18:03:01 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 30 18:03:01 2013 -0800
tree d65a96b0b7ac76da1e8102250dd686379ba6692a
parent 4ea0ecda33379735259b1eb2b5d137ade5851109
parent 682a27cbce4935a6598c42a248855eb5878c1115

am 682a27cb: Merge "Fix root inode security labeling issue."

# By Robert Craig
# Via Gerrit Code Review (1) and Robert Craig (1)
* commit '682a27cbce4935a6598c42a248855eb5878c1115':
  Fix root inode security labeling issue.

ext4_utils/make_ext4fs.c

diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c
index 5c1003d..f62fee9 100644
--- a/ext4_utils/make_ext4fs.c
+++ b/ext4_utils/make_ext4fs.c
@@ -568,8 +568,10 @@
 		if (selabel_lookup(sehnd, &secontext, mountpoint, S_IFDIR) < 0) {
 			error("cannot lookup security context for %s", mountpoint);
 		}
-		if (secontext && verbose) {
-			printf("Labeling %s as %s\n", mountpoint, secontext);
+		if (secontext) {
+			if (verbose) {
+				printf("Labeling %s as %s\n", mountpoint, secontext);
+			}
 			inode_set_selinux(root_inode_num, secontext);
 		}
 		freecon(secontext);