X-Git-Url: http://git.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=initd%2Finit.c;fp=initd%2Finit.c;h=ab6a7e180fb75a9740022caaa1de075ce57ce33e;hp=7b1a37f2fb694a38b5e730fdb72bef8298c752bc;hb=7a0096853594874d4c60266ec338ac23728017df;hpb=557c98e2966e0298a301f540824e2c3fce2452e6

diff --git a/initd/init.c b/initd/init.c
index 7b1a37f..ab6a7e1 100644
--- a/initd/init.c
+++ b/initd/init.c
@@ -80,14 +80,15 @@ selinux(char **argv)
 	int ret;
 	int enforce = selinux_status_getenforce();
 
+	/* is SELinux already initialized? */
 	if (getenv("SELINUX_INIT")) {
-		/* SELinux already initialized */
-		if (getenv("SELINUX_RESTORECON")) {
+		/* have initramfs permissions already been restored? */
+		if (!getenv("INITRAMFS") || getenv("SELINUX_RESTORECON")) {
 			unsetenv("SELINUX_INIT");
 			unsetenv("SELINUX_RESTORECON");
 			return 0;
 		}
-		/* Second call: restore filesystem labels */
+		/* Second call (initramfs only): restore filesystem labels */
 		const char *exclude_list[] = { "/dev/console", "/proc", "/sys", 0 };
 		selinux_restorecon_set_exclude_list(exclude_list);
 		ret = selinux_restorecon("/", SELINUX_RESTORECON_RECURSE | SELINUX_RESTORECON_MASS_RELABEL);