chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4f4b12c
)
libudev: initialize selinux after logging
author
Kay Sievers
<kay.sievers@vrfy.org>
Tue, 9 Sep 2008 23:47:51 +0000
(
01:47
+0200)
committer
Kay Sievers
<kay.sievers@vrfy.org>
Tue, 9 Sep 2008 23:47:51 +0000
(
01:47
+0200)
udev/lib/libudev.c
patch
|
blob
|
history
diff --git
a/udev/lib/libudev.c
b/udev/lib/libudev.c
index 4e258bd2ce6e735d14b06a5a45689dc0c460d2ac..6239377ece80734f1221ca17489087cbd6ec5dfd 100644
(file)
--- a/
udev/lib/libudev.c
+++ b/
udev/lib/libudev.c
@@
-81,6
+81,7
@@
static void selinux_init(struct udev *udev)
* restoration creation purposes.
*/
udev->selinux_enabled = (is_selinux_enabled() > 0);
* 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) {
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)));
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;
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");
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)
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;
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);
info(udev, "context %p created\n", udev);
info(udev, "log_priority=%d\n", udev->log_priority);
info(udev, "config_file='%s'\n", config_file);