chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove default settings in udev.conf
[elogind.git]
/
udev_add.c
diff --git
a/udev_add.c
b/udev_add.c
index bf5feb1b2d61cc387f03db5c768db98692b17470..174474bdc703a1bf0e6adb966979afd5b0635653 100644
(file)
--- a/
udev_add.c
+++ b/
udev_add.c
@@
-1,10
+1,8
@@
/*
* udev-add.c
*
/*
* udev-add.c
*
- * Userspace devfs
- *
* Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
* 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
*
* 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
@@
-39,11
+37,9
@@
#include "udev_libc_wrapper.h"
#include "udev.h"
#include "udev_utils.h"
#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_version.h"
#include "logging.h"
-#include "namedev.h"
-#include "udev_db.h"
+#include "udev_rules.h"
#include "udev_selinux.h"
#include "udev_selinux.h"
@@
-52,40
+48,39
@@
int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mo
struct stat stats;
int retval = 0;
struct stat stats;
int retval = 0;
+ switch (udev->type) {
+ case DEV_BLOCK:
+ mode |= S_IFBLK;
+ break;
+ case DEV_CLASS:
+ mode |= S_IFCHR;
+ break;
+ default:
+ dbg("unknown node type %c\n", udev->type);
+ return -EINVAL;
+ }
+
if (stat(file, &stats) != 0)
goto create;
/* preserve node with already correct numbers, to not change the inode number */
if (stat(file, &stats) != 0)
goto create;
/* 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);
+ if ((stats.st_mode & S_IFMT) == (mode & S_IFMT) && (stats.st_rdev == devt)) {
+ info("preserve file '%s', cause it has correct dev_t", file);
selinux_setfilecon(file, udev->kernel_name, stats.st_mode);
goto perms;
}
if (unlink(file) != 0)
selinux_setfilecon(file, udev->kernel_name, stats.st_mode);
goto perms;
}
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);
create:
else
dbg("already present file '%s' unlinked", file);
create:
- switch (udev->type) {
- case DEV_BLOCK:
- mode |= S_IFBLK;
- break;
- case DEV_CLASS:
- mode |= S_IFCHR;
- break;
- default:
- dbg("unknown node type %c\n", udev->type);
- return -EINVAL;
- }
-
selinux_setfscreatecon(file, udev->kernel_name, mode);
retval = mknod(file, mode, devt);
selinux_resetfscreatecon();
if (retval != 0) {
selinux_setfscreatecon(file, udev->kernel_name, mode);
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: %s
",
file, mode, major(devt), minor(devt), strerror(errno));
goto exit;
}
file, mode, major(devt), minor(devt), strerror(errno));
goto exit;
}
@@
-93,14
+88,14
@@
create:
perms:
dbg("chmod(%s, %#o)", file, mode);
if (chmod(file, mode) != 0) {
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) {
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;
}
file, uid, gid, strerror(errno));
goto exit;
}
@@
-150,7
+145,7
@@
static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
if (endptr[0] == '\0')
gid = (gid_t) id;
else
if (endptr[0] == '\0')
gid = (gid_t) id;
else
- gid = lookup_
user
(udev->group);
+ gid = lookup_
group
(udev->group);
}
if (!udev->test_run) {
}
if (!udev->test_run) {
@@
-182,7
+177,7
@@
static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
snprintf(partitionname, sizeof(partitionname), "%s%d", filename, i);
partitionname[sizeof(partitionname)-1] = '\0';
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);
}
}
udev_make_node(udev, partitionname, part_devt, udev->mode, uid, gid);
}
}
@@
-218,14
+213,14
@@
static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
strlcat(linktarget, &udev->name[tail], sizeof(linktarget));
strlcat(linktarget, &udev->name[tail], sizeof(linktarget));
-
dbg("symlink(%s, %s)", linktarget, filename
);
+
info("creating symlink '%s' to '%s'", filename, linktarget
);
if (!udev->test_run) {
unlink(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)
retval = symlink(linktarget, filename);
selinux_resetfscreatecon();
if (retval != 0)
-
dbg("symlink(%s, %s) failed with error '%s'
",
+
err("symlink(%s, %s) failed: %s
",
linktarget, filename, strerror(errno));
}
}
linktarget, filename, strerror(errno));
}
}
@@
-241,13
+236,13
@@
static int rename_net_if(struct udevice *udev)
struct ifreq ifr;
int retval;
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;
sk = socket(PF_INET, SOCK_DGRAM, 0);
if (sk < 0) {
if (udev->test_run)
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;
}
return -1;
}
@@
-257,7
+252,7
@@
static int rename_net_if(struct udevice *udev)
retval = ioctl(sk, SIOCSIFNAME, &ifr);
if (retval != 0)
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;
close(sk);
return retval;
@@
-268,19
+263,7
@@
int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
char *pos;
int retval = 0;
char *pos;
int retval = 0;
- 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");
- return 0;
- }
- }
-
- if (namedev_name_device(udev, class_dev) != 0)
- return 0;
-
dbg("adding name='%s'", udev->name);
dbg("adding name='%s'", udev->name);
-
selinux_init();
if (udev->type == DEV_BLOCK || udev->type == DEV_CLASS) {
selinux_init();
if (udev->type == DEV_BLOCK || udev->type == DEV_CLASS) {
@@
-289,8
+272,7
@@
int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
goto exit;
if (udev_db_add_device(udev) != 0)
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");
+ dbg("udev_db_add_dev failed, 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);
/* use full path to the environment */
snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
@@
-303,6
+285,7
@@
int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
if (retval != 0)
goto exit;
if (retval != 0)
goto exit;
+ info("renamed netif to '%s'", udev->name);
/* 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
/* 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
@@
-311,6
+294,7
@@
int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
if (pos != NULL) {
pos[1] = '\0';
strlcat(udev->devpath, udev->name, sizeof(udev->devpath));
if (pos != NULL) {
pos[1] = '\0';
strlcat(udev->devpath, udev->name, sizeof(udev->devpath));
+ strlcpy(udev->kernel_name, udev->name, sizeof(udev->kernel_name));
setenv("DEVPATH", udev->devpath, 1);
setenv("INTERFACE", udev->name, 1);
}
setenv("DEVPATH", udev->devpath, 1);
setenv("INTERFACE", udev->name, 1);
}
@@
-322,6
+306,5
@@
int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
exit:
selinux_exit();
exit:
selinux_exit();
-
return retval;
}
return retval;
}