morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 08:56:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

udevd: control - no not delete socket file when --daemon is used

Browse Source
This commit is contained in:
Kay Sievers
2011-10-10 00:38:56 +02:00
parent 5cc4112e6d
commit 1f5a5100f3
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
udev/udev-ctrl.c
View File

@@ -156,12 +156,17 @@ struct udev_ctrl *udev_ctrl_unref(struct udev_ctrl *uctrl)
return uctrl;
if (uctrl->sock >= 0)
close(uctrl->sock);
if (uctrl->cleanup_socket)
unlink(uctrl->saddr.sun_path);
free(uctrl);
return NULL;
}
int udev_ctrl_cleanup(struct udev_ctrl *uctrl)
{
if (uctrl->cleanup_socket)
unlink(uctrl->saddr.sun_path);
return 0;
}
int udev_ctrl_get_fd(struct udev_ctrl *uctrl)
{
if (uctrl == NULL)

1
udev/udev.h
View File

@@ -102,6 +102,7 @@ struct udev_ctrl *udev_ctrl_new_from_fd(struct udev *udev, int fd);
int udev_ctrl_enable_receiving(struct udev_ctrl *uctrl);
struct udev_ctrl *udev_ctrl_ref(struct udev_ctrl *uctrl);
struct udev_ctrl *udev_ctrl_unref(struct udev_ctrl *uctrl);
int udev_ctrl_cleanup(struct udev_ctrl *uctrl);
struct udev *udev_ctrl_get_udev(struct udev_ctrl *uctrl);
int udev_ctrl_get_fd(struct udev_ctrl *uctrl);
int udev_ctrl_send_set_log_level(struct udev_ctrl *uctrl, int priority, int timeout);

5
udev/udevd.c
View File

@@ -1420,7 +1420,7 @@ int main(int argc, char *argv[])
goto exit;
default:
rc = EXIT_SUCCESS;
goto exit_keep_queue;
goto exit_daemonize;
}
setsid();
@@ -1704,7 +1704,8 @@ int main(int argc, char *argv[])
rc = EXIT_SUCCESS;
exit:
udev_queue_export_cleanup(udev_queue_export);
exit_keep_queue:
udev_ctrl_cleanup(udev_ctrl);
exit_daemonize:
if (fd_ep >= 0)
close(fd_ep);
worker_list_cleanup(udev);