chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
075 release
[elogind.git]
/
udev_remove.c
diff --git
a/udev_remove.c
b/udev_remove.c
index 28885d4710faa15df1dd70f66c440408990b95a6..4d1b9286a0884a4d13ddf1c850c831be51aaab6e 100644
(file)
--- a/
udev_remove.c
+++ b/
udev_remove.c
@@
-56,8
+56,7
@@
static int delete_path(const char *path)
if (retval) {
if (errno == ENOTEMPTY)
return 0;
if (retval) {
if (errno == ENOTEMPTY)
return 0;
- dbg("rmdir(%s) failed with error '%s'",
- path, strerror(errno));
+ err("rmdir(%s) failed: %s", path, strerror(errno));
break;
}
dbg("removed '%s'", path);
break;
}
dbg("removed '%s'", path);
@@
-88,7
+87,7
@@
static int delete_node(struct udevice *udev)
continue;;
}
continue;;
}
-
dbg
("removing symlink '%s'", filename);
+
info
("removing symlink '%s'", filename);
unlink(filename);
if (strchr(filename, '/'))
unlink(filename);
if (strchr(filename, '/'))
@@
-112,6
+111,10
@@
static int delete_node(struct udevice *udev)
if (retval)
return retval;
if (retval)
return retval;
+ /* export DEVNAME to the environment */
+ snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
+ udev->devname[sizeof(udev->devname)-1] = '\0';
+
num = udev->partitions;
if (num > 0) {
info("removing all_partitions '%s[1-%i]'", filename, num);
num = udev->partitions;
if (num > 0) {
info("removing all_partitions '%s[1-%i]'", filename, num);
@@
-152,9
+155,6
@@
int udev_remove_device(struct udevice *udev)
dbg("'%s' not found in database, using kernel name '%s'", udev->devpath, udev->kernel_name);
strlcpy(udev->name, udev->kernel_name, sizeof(udev->name));
}
dbg("'%s' not found in database, using kernel name '%s'", udev->devpath, udev->kernel_name);
strlcpy(udev->name, udev->kernel_name, sizeof(udev->name));
}
- /* 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';
return delete_node(udev);
}
return delete_node(udev);
}