X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev.c;h=50fe0d1c893cad111ab7b37192ceb3029edfdfbc;hb=6bd1c78a8a3d8f26f50670925934fb39f7aff56f;hp=4e258bd2ce6e735d14b06a5a45689dc0c460d2ac;hpb=4f4b12c20388ff2cb158b040e3193f86cf7a3b96;p=elogind.git

diff --git a/udev/lib/libudev.c b/udev/lib/libudev.c
index 4e258bd2c..50fe0d1c8 100644
--- a/udev/lib/libudev.c
+++ b/udev/lib/libudev.c
@@ -48,7 +48,7 @@ struct udev {
 	int selinux_enabled;
 	security_context_t selinux_prev_scontext;
 #endif
-	int run:1;
+	int run;
 };
 
 void udev_log(struct udev *udev,
@@ -81,6 +81,7 @@ static void selinux_init(struct udev *udev)
 	 * restoration creation purposes.
 	 */
 	udev->selinux_enabled = (is_selinux_enabled() > 0);
+	info(udev, "selinux=%i\n", udev->selinux_enabled);
 	if (udev->selinux_enabled) {
 		matchpathcon_init_prefix(NULL, udev_get_dev_path(udev));
 		if (getfscreatecon(&udev->selinux_prev_scontext) < 0) {
@@ -166,9 +167,6 @@ struct udev *udev_new(void)
 	if (udev == NULL)
 		return NULL;
 	memset(udev, 0x00, (sizeof(struct udev)));
-
-	selinux_init(udev);
-	sysfs_init();
 	udev->refcount = 1;
 	udev->log_fn = log_stderr;
 	udev->log_priority = LOG_ERR;
@@ -176,7 +174,6 @@ struct udev *udev_new(void)
 	udev->dev_path = strdup(UDEV_PREFIX "/dev");
 	udev->sys_path = strdup("/sys");
 	config_file = strdup(SYSCONFDIR "/udev/udev.conf");
-
 	if (udev->dev_path == NULL ||
 	    udev->sys_path == NULL ||
 	    config_file == NULL)
@@ -299,6 +296,9 @@ struct udev *udev_new(void)
 	if (udev->dev_path == NULL || udev->sys_path == NULL)
 		goto err;
 
+	selinux_init(udev);
+	sysfs_init();
+
 	info(udev, "context %p created\n", udev);
 	info(udev, "log_priority=%d\n", udev->log_priority);
 	info(udev, "config_file='%s'\n", config_file);