#include "libsysfs/sysfs/libsysfs.h"
#include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
#include "udev_version.h"
#include "logging.h"
#include "namedev.h"
-#include "udevdb.h"
+#include "udev_db.h"
#include "selinux.h"
char *pos;
int len;
- snprintf(filename, NAME_SIZE-1, "%s/%s", udev_root, udev->name);
+ snprintf(filename, NAME_SIZE, "%s/%s", udev_root, udev->name);
filename[NAME_SIZE-1] = '\0';
switch (udev->type) {
} else {
info("creating device node '%s', major = '%d', minor = '%d', "
"mode = '%#o', uid = '%d', gid = '%d'", filename,
- udev->major, udev->minor, (mode_t)udev->mode, uid, gid);
+ udev->major, udev->minor, udev->mode, uid, gid);
}
/* create all_partitions if requested */
char linktarget[NAME_SIZE];
strfieldcpymax(linkname, pos, len+1);
- snprintf(filename, NAME_SIZE-1, "%s/%s", udev_root, linkname);
+ snprintf(filename, NAME_SIZE, "%s/%s", udev_root, linkname);
filename[NAME_SIZE-1] = '\0';
dbg("symlink '%s' to node '%s' requested", filename, udev->name);
}
if (namedev_name_device(udev, class_dev) != 0)
- goto exit;
+ return 0;
dbg("adding name='%s'", udev->name);
if (retval != 0)
goto exit;
- if (udevdb_add_dev(udev) != 0)
- dbg("udevdb_add_dev failed, but we create the node anyway, "
+ if (udev_db_add_device(udev) != 0)
+ dbg("udev_db_add_dev failed, but we create the node anyway, "
"remove might not work for custom names");
/* use full path to the environment */
- snprintf(udev->devname, NAME_SIZE-1, "%s/%s", udev_root, udev->name);
+ snprintf(udev->devname, NAME_SIZE, "%s/%s", udev_root, udev->name);
udev->devname[NAME_SIZE-1] = '\0';
} else if (udev->type == 'n') {
if (retval != 0)
goto exit;
- /* we've changed the name, now fake the devpath,
- * cause original kernel name sleeps with the fishes
- * and we don't get any event from the kernel now
+ /* we've changed the name, now fake the devpath, cause the
+ * original kernel name sleeps with the fishes and we don't
+ * get an event from the kernel with the new name
*/
pos = strrchr(udev->devpath, '/');
if (pos != NULL) {
pos[1] = '\0';
strfieldcat(udev->devpath, udev->name);
setenv("DEVPATH", udev->devpath, 1);
+ setenv("INTERFACE", udev->name, 1);
}
/* use netif name for the environment */