chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
set default device node to /dev
[elogind.git]
/
udev_add.c
diff --git
a/udev_add.c
b/udev_add.c
index 58f4ee1150584b2dd4e70e0f7eafdecfeec8260c..e9ae150180f56675bad3d1618e62833060344cd8 100644
(file)
--- a/
udev_add.c
+++ b/
udev_add.c
@@
-42,7
+42,7
@@
#include "udev_sysfs.h"
#include "udev_version.h"
#include "logging.h"
#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"
#include "udev_db.h"
#include "udev_selinux.h"
@@
-52,13
+52,24
@@
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;
}
selinux_setfilecon(file, udev->kernel_name, stats.st_mode);
goto perms;
}
@@
-69,22
+80,11
@@
int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mo
dbg("already present file '%s' unlinked", file);
create:
dbg("already present file '%s' unlinked", file);
create:
- switch (udev->type) {
- case BLOCK:
- mode |= S_IFBLK;
- break;
- case 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_setfscreatecon(file, udev->kernel_name, mode);
retval = mknod(file, mode, devt);
+ selinux_resetfscreatecon();
if (retval != 0) {
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;
}
file, mode, major(devt), minor(devt), strerror(errno));
goto exit;
}
@@
-149,7
+149,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) {
@@
-181,7
+181,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);
}
}
@@
-189,6
+189,7
@@
static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
/* create symlink(s) if requested */
list_for_each_entry(name_loop, &udev->symlink_list, node) {
/* 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);
char linktarget[PATH_SIZE];
snprintf(filename, sizeof(filename), "%s/%s", udev_root, name_loop->name);
@@
-218,9
+219,11
@@
static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
dbg("symlink(%s, %s)", linktarget, filename);
if (!udev->test_run) {
dbg("symlink(%s, %s)", linktarget, filename);
if (!udev->test_run) {
- selinux_setfscreatecon(filename, udev->kernel_name, S_IFLNK);
unlink(filename);
unlink(filename);
- if (symlink(linktarget, filename) != 0)
+ 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));
}
dbg("symlink(%s, %s) failed with error '%s'",
linktarget, filename, strerror(errno));
}
@@
-237,7
+240,7
@@
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;
if (udev->test_run)
return 0;
@@
-264,22
+267,10
@@
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 == BLOCK || udev->type == 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();
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;
retval = create_node(udev, class_dev);
if (retval != 0)
goto exit;
@@
-292,13
+283,14
@@
int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
udev->devname[sizeof(udev->devname)-1] = '\0';
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);
if (retval != 0)
goto exit;
/* look if we want to change the name of the netif */
if (strcmp(udev->name, udev->kernel_name) != 0) {
retval = rename_net_if(udev);
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
@@
-307,6
+299,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);
}
@@
-317,7
+310,6
@@
int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
}
exit:
}
exit:
- selinux_restore();
-
+ selinux_exit();
return retval;
}
return retval;
}