usb_id: use libudev

[elogind.git] / extras / floppy / create_floppy_devices.c

diff --git a/extras/floppy/create_floppy_devices.c b/extras/floppy/create_floppy_devices.c
index 2c7d44b16d01a3d6f118fad26d7e0dd9353bb88a..6c5b3b4800c91cae5be8752bdf9f173f7d44ae08 100644 (file)
--- a/extras/floppy/create_floppy_devices.c
+++ b/extras/floppy/create_floppy_devices.c
@@ -25,7 +25,6 @@
 #include <grp.h>
 
 #include "../../udev/udev.h"
-#include "../../udev/udev_selinux.h"
 
 static char *table[] = {
        "", "d360", "h1200", "u360", "u720", "h360", "h720",
@@ -69,6 +68,7 @@ int main(int argc, char **argv)
 
        logging_init("create_floppy_devices");
        udev_set_log_fn(udev, log_fn);
+       selinux_init(udev);
 
        while ((c = getopt(argc, argv, "cudm:U:G:M:t:")) != -1) {
                switch (c) {
@@ -145,8 +145,6 @@ int main(int argc, char **argv)
        if (type == 0)
                return 0;
 
-       selinux_init(udev);
-
        i = 0;
        while (table_sup[type][i]) {
                sprintf(node, "%s%s", dev, table[table_sup[type][i]]);
@@ -155,9 +153,9 @@ int main(int argc, char **argv)
                        printf("%s b %d %d %d\n", node, mode, major, minor);
                if (create_nodes) {
                        unlink(node);
-                       selinux_setfscreatecon(udev, node, NULL, S_IFBLK | mode);
+                       udev_selinux_setfscreatecon(udev, node, S_IFBLK | mode);
                        mknod(node, S_IFBLK | mode, makedev(major,minor));
-                       selinux_resetfscreatecon(udev);
+                       udev_selinux_resetfscreatecon(udev);
                        chown(node, uid, gid);
                        chmod(node, S_IFBLK | mode);
                }