diff options
| author | Kay Sievers <kay@vrfy.org> | 2012-05-31 13:34:41 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2012-05-31 13:34:41 +0200 |
| commit | 0f9963a8b8c1d60a467c0cdc04d5e7bfce9d7c75 (patch) | |
| tree | 6c53700179961f7c2e039abeda48c89bef0be103 /src/udev | |
| parent | 667e392408d6b56db981d8e76c31990501d0faf3 (diff) | |
Revert "label: fix systemd-udev labeling of /run directory."
This reverts commit 9b5af248f04b6cad8a5bca836e89a39e9f6823d9.
Udev now explicitely labels only files/directories in /dev. The selinux
array API is not released and will not work on other distros at this moment.
Diffstat (limited to 'src/udev')
| -rw-r--r-- | src/udev/udevadm.c | 4 | ||||
| -rw-r--r-- | src/udev/udevd.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c index fafa31bba4..5217d7f9dd 100644 --- a/src/udev/udevadm.c +++ b/src/udev/udevadm.c @@ -91,7 +91,6 @@ int main(int argc, char *argv[]) { "version", no_argument, NULL, 'V' }, {} }; - const char *prefixes[] = { "/dev", "/run", NULL }; const char *command; unsigned int i; int rc = 1; @@ -103,8 +102,7 @@ int main(int argc, char *argv[]) log_open(); log_parse_environment(); udev_set_log_fn(udev, udev_main_log); - - label_init(prefixes); + label_init("/dev"); for (;;) { int option; diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 43937db890..790531022c 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -1030,7 +1030,6 @@ int main(int argc, char *argv[]) int fd_ctrl = -1; int fd_netlink = -1; int fd_worker = -1; - const char *prefixes[] = { "/dev", "/run", NULL }; struct epoll_event ep_ctrl, ep_inotify, ep_signal, ep_netlink, ep_worker; struct udev_ctrl_connection *ctrl_conn = NULL; int rc = 1; @@ -1043,7 +1042,7 @@ int main(int argc, char *argv[]) log_parse_environment(); udev_set_log_fn(udev, udev_main_log); log_debug("version %s\n", VERSION); - label_init(prefixes); + label_init("/dev"); for (;;) { int option; |