chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
path_id: add support for iSCSI devices
[elogind.git]
/
udev_node.c
diff --git
a/udev_node.c
b/udev_node.c
index d2889a329e22201a55c6039b8ee0109bf47e6480..2a30fe32223351a76ef1f594de1e9d7f48dea608 100644
(file)
--- a/
udev_node.c
+++ b/
udev_node.c
@@
-231,7
+231,6
@@
void udev_node_remove_symlinks(struct udevice *udev)
char filename[PATH_SIZE];
struct name_entry *name_loop;
struct stat stats;
char filename[PATH_SIZE];
struct name_entry *name_loop;
struct stat stats;
- int retval;
if (!list_empty(&udev->symlink_list)) {
char symlinks[512] = "";
if (!list_empty(&udev->symlink_list)) {
char symlinks[512] = "";
@@
-250,10
+249,12
@@
void udev_node_remove_symlinks(struct udevice *udev)
}
info("removing symlink '%s'", filename);
}
info("removing symlink '%s'", filename);
- unlink(filename);
+ if (!udev->test_run) {
+ unlink(filename);
- if (strchr(filename, '/'))
- delete_path(filename);
+ if (strchr(filename, '/'))
+ delete_path(filename);
+ }
strlcat(symlinks, filename, sizeof(symlinks));
strlcat(symlinks, " ", sizeof(symlinks));
strlcat(symlinks, filename, sizeof(symlinks));
strlcat(symlinks, " ", sizeof(symlinks));