X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fudev%2Fudevd.c;h=2e6c71352f8776f03c717bdc8af9cb30f6bea679;hb=ea7061e4d431c3e03212243f65148f2e985d80b7;hp=37db81c8bba9ba0f8c2a0ae32f7291333100fcf3;hpb=65fea570f03df51dadc06a3e0d261a71fe62aa01;p=elogind.git

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 37db81c8b..2e6c71352 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1139,7 +1139,7 @@ int main(int argc, char *argv[]) {
                 goto exit;
         }
 
-        r = label_init("/dev");
+        r = mac_selinux_init("/dev");
         if (r < 0) {
                 log_error("could not initialize labelling: %s", strerror(-r));
                 goto exit;
@@ -1155,7 +1155,7 @@ int main(int argc, char *argv[]) {
         umask(022);
 
         r = mkdir("/run/udev", 0755);
-        if (r < 0) {
+        if (r < 0 && errno != EEXIST) {
                 log_error("could not create /run/udev: %m");
                 goto exit;
         }
@@ -1542,7 +1542,7 @@ exit_daemonize:
         udev_monitor_unref(monitor);
         udev_ctrl_connection_unref(ctrl_conn);
         udev_ctrl_unref(udev_ctrl);
-        label_finish();
+        mac_selinux_finish();
         udev_unref(udev);
         log_close();
         return rc;