/*
* udev-add.c
*
- * Userspace devfs
- *
* Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- *
+ * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
#include "udev_libc_wrapper.h"
#include "udev.h"
#include "udev_utils.h"
-#include "udev_sysfs.h"
#include "udev_version.h"
#include "logging.h"
#include "udev_rules.h"
-#include "udev_db.h"
#include "udev_selinux.h"
}
if (unlink(file) != 0)
- dbg("unlink(%s) failed with error '%s'", file, strerror(errno));
+ err("unlink(%s) failed: %s", file, strerror(errno));
else
dbg("already present file '%s' unlinked", file);
retval = mknod(file, mode, devt);
selinux_resetfscreatecon();
if (retval != 0) {
- err("mknod(%s, %#o, %u, %u) failed with error '%s'",
+ err("mknod(%s, %#o, %u, %u) failed: %s",
file, mode, major(devt), minor(devt), strerror(errno));
goto exit;
}
perms:
dbg("chmod(%s, %#o)", file, mode);
if (chmod(file, mode) != 0) {
- dbg("chmod(%s, %#o) failed with error '%s'", file, mode, strerror(errno));
+ err("chmod(%s, %#o) failed: %s", file, mode, strerror(errno));
goto exit;
}
if (uid != 0 || gid != 0) {
dbg("chown(%s, %u, %u)", file, uid, gid);
if (chown(file, uid, gid) != 0) {
- dbg("chown(%s, %u, %u) failed with error '%s'",
+ err("chown(%s, %u, %u) failed: %s",
file, uid, gid, strerror(errno));
goto exit;
}
static int create_node(struct udevice *udev, struct sysfs_class_device *class_dev)
{
char filename[PATH_SIZE];
- char partitionname[PATH_SIZE];
struct name_entry *name_loop;
uid_t uid;
gid_t gid;
info("creating device node '%s'", filename);
if (udev_make_node(udev, filename, udev->devt, udev->mode, uid, gid) != 0)
goto error;
+ setenv("DEVNAME", filename, 1);
} else {
info("creating device node '%s', major = '%d', minor = '%d', "
"mode = '%#o', uid = '%d', gid = '%d'", filename,
/* create all_partitions if requested */
if (udev->partitions) {
+ char partitionname[PATH_SIZE];
struct sysfs_attribute *attr;
int range;
}
/* create symlink(s) if requested */
- list_for_each_entry(name_loop, &udev->symlink_list, node) {
- int retval;
- char linktarget[PATH_SIZE];
-
- snprintf(filename, sizeof(filename), "%s/%s", udev_root, name_loop->name);
- filename[sizeof(filename)-1] = '\0';
-
- dbg("symlink '%s' to node '%s' requested", filename, udev->name);
- if (!udev->test_run)
- if (strchr(filename, '/'))
- create_path(filename);
-
- /* optimize relative link */
- linktarget[0] = '\0';
- i = 0;
- tail = 0;
- while (udev->name[i] && (udev->name[i] == name_loop->name[i])) {
- if (udev->name[i] == '/')
- tail = i+1;
- i++;
- }
- while (name_loop->name[i] != '\0') {
- if (name_loop->name[i] == '/')
- strlcat(linktarget, "../", sizeof(linktarget));
- i++;
- }
+ if (!list_empty(&udev->symlink_list)) {
+ char symlinks[512] = "";
+
+ list_for_each_entry(name_loop, &udev->symlink_list, node) {
+ int retval;
+ char linktarget[PATH_SIZE];
+
+ snprintf(filename, sizeof(filename), "%s/%s", udev_root, name_loop->name);
+ filename[sizeof(filename)-1] = '\0';
+
+ dbg("symlink '%s' to node '%s' requested", filename, udev->name);
+ if (!udev->test_run)
+ if (strchr(filename, '/'))
+ create_path(filename);
+
+ /* optimize relative link */
+ linktarget[0] = '\0';
+ i = 0;
+ tail = 0;
+ while (udev->name[i] && (udev->name[i] == name_loop->name[i])) {
+ if (udev->name[i] == '/')
+ tail = i+1;
+ i++;
+ }
+ while (name_loop->name[i] != '\0') {
+ if (name_loop->name[i] == '/')
+ strlcat(linktarget, "../", sizeof(linktarget));
+ i++;
+ }
- strlcat(linktarget, &udev->name[tail], sizeof(linktarget));
+ strlcat(linktarget, &udev->name[tail], sizeof(linktarget));
+
+ info("creating symlink '%s' to '%s'", filename, linktarget);
+ if (!udev->test_run) {
+ unlink(filename);
+ selinux_setfscreatecon(filename, NULL, S_IFLNK);
+ retval = symlink(linktarget, filename);
+ selinux_resetfscreatecon();
+ if (retval != 0)
+ err("symlink(%s, %s) failed: %s",
+ linktarget, filename, strerror(errno));
+ }
- dbg("symlink(%s, %s)", linktarget, filename);
- if (!udev->test_run) {
- unlink(filename);
- selinux_setfscreatecon(filename, NULL, S_IFLNK);
- retval = symlink(linktarget, filename);
- selinux_resetfscreatecon();
- if (retval != 0)
- dbg("symlink(%s, %s) failed with error '%s'",
- linktarget, filename, strerror(errno));
+ strlcat(symlinks, filename, sizeof(symlinks));
+ strlcat(symlinks, " ", sizeof(symlinks));
}
+
+ remove_trailing_chars(symlinks, ' ');
+ setenv("DEVLINKS", symlinks, 1);
}
return 0;
sk = socket(PF_INET, SOCK_DGRAM, 0);
if (sk < 0) {
- dbg("error opening socket");
+ err("error opening socket: %s", strerror(errno));
return -1;
}
retval = ioctl(sk, SIOCSIFNAME, &ifr);
if (retval != 0)
- dbg("error changing net interface name");
+ err("error changing net interface name: %s", strerror(errno));
close(sk);
return retval;
goto exit;
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, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
- udev->devname[sizeof(udev->devname)-1] = '\0';
-
+ dbg("udev_db_add_dev failed, remove might not work for custom names");
} 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) {
setenv("DEVPATH", udev->devpath, 1);
setenv("INTERFACE", udev->name, 1);
}
-
- /* use netif name for the environment */
- strlcpy(udev->devname, udev->name, sizeof(udev->devname));
}
}
~ianmdlvl / elogind.git / blobdiff