chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update Debian rules
[elogind.git]
/
extras
/
run_directory
/
udev_run_hotplugd.c
diff --git
a/extras/run_directory/udev_run_hotplugd.c
b/extras/run_directory/udev_run_hotplugd.c
index 54b6bf44e30458835c0d985b5a082d5f401b67ea..f94c237e375503da256cc3bef2914571d53211ed 100644
(file)
--- a/
extras/run_directory/udev_run_hotplugd.c
+++ b/
extras/run_directory/udev_run_hotplugd.c
@@
-22,11
+22,9
@@
#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/stat.h>
-#include "../../udev_utils.h"
-#include "../../list.h"
-#include "../../logging.h"
+#include "../../udev.h"
+#include "run_directory.h"
-extern int run_directory(const char *dir, const char *suffix, const char *subsystem);
#ifdef USE_LOG
void log_message (int priority, const char *format, ...)
#ifdef USE_LOG
void log_message (int priority, const char *format, ...)
@@
-55,6
+53,7
@@
void log_message (int priority, const char *format, ...)
int main(int argc, char *argv[], char *envp[])
{
int main(int argc, char *argv[], char *envp[])
{
+ char dirname[NAME_SIZE];
const char *subsystem;
int fd;
const char *subsystem;
int fd;
@@
-69,8
+68,10
@@
int main(int argc, char *argv[], char *envp[])
close(fd);
}
close(fd);
}
- dbg("running
dev
.d directory");
+ dbg("running
hotplug
.d directory");
- run_directory("/etc/hotplug.d", ".hotplug", subsystem);
+ sprintf(dirname, "/etc/hotplug.d/%s", subsystem);
+ run_directory(dirname, ".hotplug", subsystem);
+ run_directory("/etc/hotplug.d/default", ".hotplug", subsystem);
exit(0);
}
exit(0);
}