diff options
| author | Colin Cross <ccross@android.com> | 2013-01-30 18:06:29 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-30 18:06:29 -0800 |
| commit | 385e1cd6ae59bf09d83baf8909a62e3371dd29fc (patch) | |
| tree | 39a2bb3c8e1090d41b69d4fcb2575e4be5943afc | |
| parent | cf90d74366b794c4416facf57dd8f7ab4a079524 (diff) | |
| parent | 44c116d55f59b6b4839747620e0c6cd299f8e9f8 (diff) | |
| download | extras-385e1cd6ae59bf09d83baf8909a62e3371dd29fc.tar.gz | |
am 44c116d5: am 682a27cb: Merge "Fix root inode security labeling issue."
# By Robert Craig
# Via Android Git Automerger (1) and others
* commit '44c116d55f59b6b4839747620e0c6cd299f8e9f8':
Fix root inode security labeling issue.
| -rw-r--r-- | ext4_utils/make_ext4fs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c index 5c1003d3..f62fee9f 100644 --- a/ext4_utils/make_ext4fs.c +++ b/ext4_utils/make_ext4fs.c @@ -568,8 +568,10 @@ int make_ext4fs_internal(int fd, const char *_directory, 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); |