From: Kay Sievers <kay@vrfy.org>
Date: Thu, 31 May 2012 11:20:06 +0000 (+0200)
Subject: udev: do not selinux label files in /run/udev
X-Git-Tag: v185~32
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=667e392408d6b56db981d8e76c31990501d0faf3;hp=c66e7f04997fb42b778703418097a5023fa17581

udev: do not selinux label files in /run/udev
---

diff --git a/src/udev/udev-builtin-firmware.c b/src/udev/udev-builtin-firmware.c
index 69e1db980..56dc8fcaa 100644
--- a/src/udev/udev-builtin-firmware.c
+++ b/src/udev/udev-builtin-firmware.c
@@ -121,7 +121,7 @@ static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], boo
                 /* This link indicates the missing firmware file and the associated device */
                 log_debug("did not find firmware file '%s'\n", firmware);
                 do {
-                        err = mkdir_parents_label(misspath, 0755);
+                        err = mkdir_parents(misspath, 0755);
                         if (err != 0 && err != -ENOENT)
                                 break;
                         err = symlink(udev_device_get_devpath(dev), misspath);
diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c
index 04609a776..1091ec8d6 100644
--- a/src/udev/udev-watch.c
+++ b/src/udev/udev-watch.c
@@ -111,7 +111,7 @@ void udev_watch_begin(struct udev *udev, struct udev_device *dev)
         }
 
         snprintf(filename, sizeof(filename), "/run/udev/watch/%d", wd);
-        mkdir_parents_label(filename, 0755);
+        mkdir_parents(filename, 0755);
         unlink(filename);
         symlink(udev_device_get_id_filename(dev), filename);
 
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 131d12d1b..43937db89 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -896,7 +896,7 @@ static int convert_db(struct udev *udev)
                 return 0;
 
         /* make sure we do not get here again */
-        mkdir_parents_label("/run/udev/data", 0755);
+        mkdir_parents("/run/udev/data", 0755);
         mkdir(filename, 0755);
 
         /* old database */