chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow programs in /lib/udev called without the path
[elogind.git]
/
udev_add.c
diff --git
a/udev_add.c
b/udev_add.c
index 9d872bf039474f2be8668e4f7c545a2e7227bf39..128917e519db9457720fdca27c15ebc9ca32a76c 100644
(file)
--- a/
udev_add.c
+++ b/
udev_add.c
@@
-37,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_rules.h"
#include "udev_version.h"
#include "logging.h"
#include "udev_rules.h"
-#include "udev_db.h"
#include "udev_selinux.h"
#include "udev_selinux.h"
@@
-73,7
+71,7
@@
int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mo
}
if (unlink(file) != 0)
}
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);
else
dbg("already present file '%s' unlinked", file);
@@
-82,7
+80,7
@@
create:
retval = mknod(file, mode, devt);
selinux_resetfscreatecon();
if (retval != 0) {
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;
}
file, mode, major(devt), minor(devt), strerror(errno));
goto exit;
}
@@
-90,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;
}
@@
-215,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);
selinux_setfscreatecon(filename, NULL, S_IFLNK);
retval = symlink(linktarget, filename);
selinux_resetfscreatecon();
if (retval != 0)
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'
",
+
err("symlink(%s, %s) failed: %s
",
linktarget, filename, strerror(errno));
}
}
linktarget, filename, strerror(errno));
}
}
@@
-244,7
+242,7
@@
static int rename_net_if(struct udevice *udev)
sk = socket(PF_INET, SOCK_DGRAM, 0);
if (sk < 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;
}
@@
-254,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;