#include "udev_sysfs.h"
#include "udev_version.h"
#include "logging.h"
-#include "namedev.h"
+#include "udev_rules.h"
#include "udev_db.h"
#include "udev_selinux.h"
/* preserve node with already correct numbers, to not change the inode number */
if (((stats.st_mode & S_IFMT) == S_IFBLK || (stats.st_mode & S_IFMT) == S_IFCHR) &&
(stats.st_rdev == devt)) {
- dbg("preserve file '%s', cause it has correct dev_t", file);
+ info("preserve file '%s', cause it has correct dev_t", file);
selinux_setfilecon(file, udev->kernel_name, stats.st_mode);
goto perms;
}
create:
switch (udev->type) {
- case BLOCK:
+ case DEV_BLOCK:
mode |= S_IFBLK;
break;
- case CLASS:
+ case DEV_CLASS:
mode |= S_IFCHR;
break;
default:
retval = mknod(file, mode, devt);
selinux_resetfscreatecon();
if (retval != 0) {
- dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
+ err("mknod(%s, %#o, %u, %u) failed with error '%s'",
file, mode, major(devt), minor(devt), strerror(errno));
goto exit;
}
if (endptr[0] == '\0')
gid = (gid_t) id;
else
- gid = lookup_user(udev->group);
+ gid = lookup_group(udev->group);
}
if (!udev->test_run) {
snprintf(partitionname, sizeof(partitionname), "%s%d", filename, i);
partitionname[sizeof(partitionname)-1] = '\0';
- part_devt = makedev(major(udev->devt), minor(udev->devt)+1);
+ part_devt = makedev(major(udev->devt), minor(udev->devt) + i);
udev_make_node(udev, partitionname, part_devt, udev->mode, uid, gid);
}
}
dbg("symlink(%s, %s)", linktarget, filename);
if (!udev->test_run) {
unlink(filename);
- selinux_setfscreatecon(filename, udev->kernel_name, S_IFLNK);
+ selinux_setfscreatecon(filename, NULL, S_IFLNK);
retval = symlink(linktarget, filename);
selinux_resetfscreatecon();
if (retval != 0)
struct ifreq ifr;
int retval;
- dbg("changing net interface name from '%s' to '%s'", udev->kernel_name, udev->name);
+ info("changing net interface name from '%s' to '%s'", udev->kernel_name, udev->name);
if (udev->test_run)
return 0;
char *pos;
int retval = 0;
- if (udev->type == BLOCK || udev->type == CLASS) {
+ if (udev->type == DEV_BLOCK || udev->type == DEV_CLASS) {
udev->devt = get_devt(class_dev);
if (!udev->devt) {
dbg("no dev-file found, do nothing");
}
}
- if (namedev_name_device(udev, class_dev) != 0)
+ udev_rules_get_name(udev, class_dev);
+ if (udev->ignore_device) {
+ dbg("device event will be ignored");
return 0;
+ }
dbg("adding name='%s'", udev->name);
selinux_init();
- if (udev->type == BLOCK || udev->type == CLASS) {
+ if (udev->type == DEV_BLOCK || udev->type == DEV_CLASS) {
retval = create_node(udev, class_dev);
if (retval != 0)
goto exit;
snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
udev->devname[sizeof(udev->devname)-1] = '\0';
- } else if (udev->type == NET) {
+ } else if (udev->type == DEV_NET) {
/* look if we want to change the name of the netif */
if (strcmp(udev->name, udev->kernel_name) != 0) {
retval = rename_net_if(udev);