[PATCH] split udev and udevstart
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>
Sun, 6 Mar 2005 23:01:34 +0000 (00:01 +0100)
committerGreg KH <gregkh@suse.de>
Wed, 27 Apr 2005 06:51:00 +0000 (23:51 -0700)
Makefile
udev.c
udev_start.c [deleted file]
udevstart.c [new file with mode: 0644]

index f2d445d627f0d08ec382424744f21ade3e9f14a3..9b37402fb938479d1ae9ead64a610565d50f278e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -139,7 +139,6 @@ UDEV_OBJS = \
        udev_config.o           \
        udev_add.o              \
        udev_remove.o           \
-       udev_start.o            \
        udev_sysfs.o            \
        udev_db.o               \
        udev_multiplex.o        \
@@ -222,7 +221,7 @@ endif
 # config files automatically generated
 GEN_CONFIGS =  $(LOCAL_CFG_DIR)/udev.conf
 
-all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER) $(GEN_CONFIGS)
+all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER) $(STARTER) $(GEN_CONFIGS)
        @extras="$(EXTRAS)" ; for target in $$extras ; do \
                echo $$target ; \
                $(MAKE) prefix=$(prefix) \
@@ -311,6 +310,10 @@ $(SENDER): $(LIBC) $(SENDER).o $(OBJS) udevd.h
        $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(SENDER).o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(QUIET) $(STRIPCMD) $@
 
+$(STARTER): $(LIBC) $(STARTER).o $(OBJS)
+       $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(STARTER).o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+       $(QUIET) $(STRIPCMD) $@
+
 .c.o:
        $(QUIET) $(CC) $(CFLAGS) -c -o $@ $<
 
@@ -405,7 +408,7 @@ install: install-config install-man install-dev.d all
        $(INSTALL_PROGRAM) -D $(SENDER) $(DESTDIR)$(sbindir)/$(SENDER)
        $(INSTALL_PROGRAM) -D $(INFO) $(DESTDIR)$(usrbindir)/$(INFO)
        $(INSTALL_PROGRAM) -D $(TESTER) $(DESTDIR)$(usrbindir)/$(TESTER)
-       - ln -f -s $(sbindir)/udev $(DESTDIR)$(sbindir)/$(STARTER)
+       $(INSTALL_PROGRAM) -D $(STARTER) $(DESTDIR)$(sbindir)/$(STARTER)
        - ln -f -s $(sbindir)/$(SENDER) $(DESTDIR)$(hotplugdir)/10-udev.hotplug
 ifndef DESTDIR
        - killall $(DAEMON)
diff --git a/udev.c b/udev.c
index 76de8181d17e6c1fcba9095674477da03ab93988..c9461469e54273561da1ba0cc1f9fc740c735974 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -130,17 +130,6 @@ int main(int argc, char *argv[], char *envp[])
        /* trigger timeout to prevent hanging processes */
        alarm(ALARM_TIMEOUT);
 
-       if (strstr(argv[0], "udevstart") || (argc == 2 && strstr(argv[1], "udevstart"))) {
-               dbg("udevstart");
-
-               /* disable all logging, as it's much too slow on some facilities */
-               udev_log = 0;
-
-               namedev_init();
-               retval = udev_start();
-               goto exit;
-       }
-
        /* let the executed programs know if we handle the whole hotplug event */
        managed_event = manage_hotplug_event();
        if (managed_event)
@@ -240,7 +229,6 @@ hotplug:
        if (udev_hotplug_d && managed_event)
                udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
 
-exit:
        logging_close();
        return retval;
 }
diff --git a/udev_start.c b/udev_start.c
deleted file mode 100644 (file)
index dcb4293..0000000
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * udevstart.c
- *
- * Copyright (C) 2004 Greg Kroah-Hartman <greg@kroah.com>
- * 
- * Quick and dirty way to populate a /dev with udev if your system
- * does not have access to a shell.  Based originally on a patch to udev 
- * from Harald Hoyer <harald@redhat.com>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- * 
- *     This program is distributed in the hope that it will be useful, but
- *     WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *     General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License along
- *     with this program; if not, write to the Free Software Foundation, Inc.,
- *     675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <ctype.h>
-#include <dirent.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "libsysfs/sysfs/libsysfs.h"
-#include "logging.h"
-#include "udev_utils.h"
-#include "list.h"
-#include "udev.h"
-
-
-#define MAX_PATH_SIZE          512
-
-struct device {
-       struct list_head list;
-       char path[MAX_PATH_SIZE];
-       char subsys[MAX_PATH_SIZE];
-};
-
-/* sort files in lexical order */
-static int device_list_insert(const char *path, char *subsystem, struct list_head *device_list)
-{
-       struct device *loop_device;
-       struct device *new_device;
-
-       dbg("insert: '%s'\n", path);
-
-       list_for_each_entry(loop_device, device_list, list) {
-               if (strcmp(loop_device->path, path) > 0) {
-                       break;
-               }
-       }
-
-       new_device = malloc(sizeof(struct device));
-       if (new_device == NULL) {
-               dbg("error malloc");
-               return -ENOMEM;
-       }
-
-       strfieldcpy(new_device->path, path);
-       strfieldcpy(new_device->subsys, subsystem);
-       list_add_tail(&new_device->list, &loop_device->list);
-       dbg("add '%s' from subsys '%s'", new_device->path, new_device->subsys);
-       return 0;
-}
-
-/* list of devices that we should run last due to any one of a number of reasons */
-static char *last_list[] = {
-       "/block/dm",    /* on here because dm wants to have the block devices around before it */
-       NULL,
-};
-
-/* list of devices that we should run first due to any one of a number of reasons */
-static char *first_list[] = {
-       "/class/mem",   /* people tend to like their memory devices around first... */
-       NULL,
-};
-
-static int add_device(const char *path, const char *subsystem)
-{
-       struct udevice udev;
-       struct sysfs_class_device *class_dev;
-       const char *devpath;
-
-       devpath = &path[strlen(sysfs_path)];
-
-       /* set environment for callouts and dev.d/ */
-       setenv("DEVPATH", devpath, 1);
-       setenv("SUBSYSTEM", subsystem, 1);
-
-       dbg("exec  : '%s' (%s)\n", devpath, path);
-
-       class_dev = sysfs_open_class_device_path(path);
-       if (class_dev == NULL) {
-               dbg ("sysfs_open_class_device_path failed");
-               return -ENODEV;
-       }
-
-       udev_init_device(&udev, devpath, subsystem);
-       udev_add_device(&udev, class_dev);
-
-       /* run dev.d/ scripts if we created a node or changed a netif name */
-       if (udev_dev_d && udev.devname[0] != '\0') {
-               setenv("DEVNAME", udev.devname, 1);
-               udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
-       }
-
-       sysfs_close_class_device(class_dev);
-
-       return 0;
-}
-
-static void exec_list(struct list_head *device_list)
-{
-       struct device *loop_device;
-       struct device *tmp_device;
-       int i;
-
-       /* handle the "first" type devices first */
-       list_for_each_entry_safe(loop_device, tmp_device, device_list, list) {
-               for (i = 0; first_list[i] != NULL; i++) {
-                       if (strncmp(loop_device->path, first_list[i], strlen(first_list[i])) == 0) {
-                               add_device(loop_device->path, loop_device->subsys);
-                               list_del(&loop_device->list);
-                               free(loop_device);
-                               break;
-                       }
-               }
-       }
-
-       /* handle the devices we are allowed to, excluding the "last" type devices */
-       list_for_each_entry_safe(loop_device, tmp_device, device_list, list) {
-               int found = 0;
-               for (i = 0; last_list[i] != NULL; i++) {
-                       if (strncmp(loop_device->path, last_list[i], strlen(last_list[i])) == 0) {
-                               found = 1;
-                               break;
-                       }
-               }
-               if (found)
-                       continue;
-
-               add_device(loop_device->path, loop_device->subsys);
-               list_del(&loop_device->list);
-               free(loop_device);
-       }
-
-       /* handle the rest of the devices left over, if any */
-       list_for_each_entry_safe(loop_device, tmp_device, device_list, list) {
-               add_device(loop_device->path, loop_device->subsys);
-               list_del(&loop_device->list);
-               free(loop_device);
-       }
-}
-
-static int has_devt(const char *directory)
-{
-       char filename[MAX_PATH_SIZE];
-       struct stat statbuf;
-
-       snprintf(filename, MAX_PATH_SIZE, "%s/dev", directory);
-       filename[MAX_PATH_SIZE-1] = '\0';
-
-       if (stat(filename, &statbuf) == 0)
-               return 1;
-
-       return 0;
-}
-
-static void udev_scan_block(void)
-{
-       char base[MAX_PATH_SIZE];
-       DIR *dir;
-       struct dirent *dent;
-       LIST_HEAD(device_list);
-
-       snprintf(base, MAX_PATH_SIZE, "%s/block", sysfs_path);
-       base[MAX_PATH_SIZE-1] = '\0';
-
-       dir = opendir(base);
-       if (dir != NULL) {
-               for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-                       char dirname[MAX_PATH_SIZE];
-                       DIR *dir2;
-                       struct dirent *dent2;
-
-                       if (dent->d_name[0] == '.')
-                               continue;
-
-                       snprintf(dirname, MAX_PATH_SIZE, "%s/%s", base, dent->d_name);
-                       dirname[MAX_PATH_SIZE-1] = '\0';
-                       if (has_devt(dirname))
-                               device_list_insert(dirname, "block", &device_list);
-                       else
-                               continue;
-
-                       snprintf(dirname, MAX_PATH_SIZE, "%s/%s", base, dent->d_name);
-                       dir2 = opendir(dirname);
-                       if (dir2 != NULL) {
-                               for (dent2 = readdir(dir2); dent2 != NULL; dent2 = readdir(dir2)) {
-                                       char dirname2[MAX_PATH_SIZE];
-
-                                       if (dent2->d_name[0] == '.')
-                                               continue;
-
-                                       snprintf(dirname2, MAX_PATH_SIZE, "%s/%s", dirname, dent2->d_name);
-                                       dirname2[MAX_PATH_SIZE-1] = '\0';
-
-                                       if (has_devt(dirname2))
-                                               device_list_insert(dirname2, "block", &device_list);
-                               }
-                               closedir(dir2);
-                       }
-               }
-               closedir(dir);
-       }
-
-       exec_list(&device_list);
-}
-
-static void udev_scan_class(void)
-{
-       char base[MAX_PATH_SIZE];
-       DIR *dir;
-       struct dirent *dent;
-       LIST_HEAD(device_list);
-
-       snprintf(base, MAX_PATH_SIZE, "%s/class", sysfs_path);
-       base[MAX_PATH_SIZE-1] = '\0';
-
-       dir = opendir(base);
-       if (dir != NULL) {
-               for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-                       char dirname[MAX_PATH_SIZE];
-                       DIR *dir2;
-                       struct dirent *dent2;
-
-                       if (dent->d_name[0] == '.')
-                               continue;
-
-                       snprintf(dirname, MAX_PATH_SIZE, "%s/%s", base, dent->d_name);
-                       dirname[MAX_PATH_SIZE-1] = '\0';
-                       dir2 = opendir(dirname);
-                       if (dir2 != NULL) {
-                               for (dent2 = readdir(dir2); dent2 != NULL; dent2 = readdir(dir2)) {
-                                       char dirname2[MAX_PATH_SIZE];
-
-                                       if (dent2->d_name[0] == '.')
-                                               continue;
-
-                                       snprintf(dirname2, MAX_PATH_SIZE, "%s/%s", dirname, dent2->d_name);
-                                       dirname2[MAX_PATH_SIZE-1] = '\0';
-
-                                       /* pass the net class as it is */
-                                       if (strcmp(dent->d_name, "net") == 0)
-                                               device_list_insert(dirname2, "net", &device_list);
-                                       else if (has_devt(dirname2))
-                                               device_list_insert(dirname2, dent->d_name, &device_list);
-                               }
-                               closedir(dir2);
-                       }
-               }
-               closedir(dir);
-       }
-
-       exec_list(&device_list);
-}
-
-int udev_start(void)
-{
-       /* set environment for callouts and dev.d/ */
-       setenv("ACTION", "add", 1);
-       setenv("UDEV_START", "1", 1);
-
-       udev_scan_class();
-       udev_scan_block();
-
-       return 0;
-}
diff --git a/udevstart.c b/udevstart.c
new file mode 100644 (file)
index 0000000..97d3849
--- /dev/null
@@ -0,0 +1,325 @@
+/*
+ * udevstart.c
+ *
+ * Copyright (C) 2004 Greg Kroah-Hartman <greg@kroah.com>
+ * 
+ * Quick and dirty way to populate a /dev with udev if your system
+ * does not have access to a shell.  Based originally on a patch to udev 
+ * from Harald Hoyer <harald@redhat.com>
+ *
+ *     This program is free software; you can redistribute it and/or modify it
+ *     under the terms of the GNU General Public License as published by the
+ *     Free Software Foundation version 2 of the License.
+ * 
+ *     This program is distributed in the hope that it will be useful, but
+ *     WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *     General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU General Public License along
+ *     with this program; if not, write to the Free Software Foundation, Inc.,
+ *     675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include "libsysfs/sysfs/libsysfs.h"
+#include "logging.h"
+#include "namedev.h"
+#include "udev_utils.h"
+#include "list.h"
+#include "udev.h"
+
+#ifdef USE_LOG
+void log_message(int level, const char *format, ...)
+{
+}
+#endif
+
+struct device {
+       struct list_head list;
+       char path[DEVPATH_SIZE];
+       char subsys[SUBSYSTEM_SIZE];
+};
+
+/* sort files in lexical order */
+static int device_list_insert(const char *path, char *subsystem, struct list_head *device_list)
+{
+       struct device *loop_device;
+       struct device *new_device;
+
+       dbg("insert: '%s'\n", path);
+
+       list_for_each_entry(loop_device, device_list, list) {
+               if (strcmp(loop_device->path, path) > 0) {
+                       break;
+               }
+       }
+
+       new_device = malloc(sizeof(struct device));
+       if (new_device == NULL) {
+               dbg("error malloc");
+               return -ENOMEM;
+       }
+
+       strfieldcpy(new_device->path, path);
+       strfieldcpy(new_device->subsys, subsystem);
+       list_add_tail(&new_device->list, &loop_device->list);
+       dbg("add '%s' from subsys '%s'", new_device->path, new_device->subsys);
+       return 0;
+}
+
+/* list of devices that we should run last due to any one of a number of reasons */
+static char *last_list[] = {
+       "/block/dm",    /* on here because dm wants to have the block devices around before it */
+       NULL,
+};
+
+/* list of devices that we should run first due to any one of a number of reasons */
+static char *first_list[] = {
+       "/class/mem",   /* people tend to like their memory devices around first... */
+       NULL,
+};
+
+static int add_device(const char *path, const char *subsystem)
+{
+       struct udevice udev;
+       struct sysfs_class_device *class_dev;
+       const char *devpath;
+
+       devpath = &path[strlen(sysfs_path)];
+
+       /* set environment for callouts and dev.d/ */
+       setenv("DEVPATH", devpath, 1);
+       setenv("SUBSYSTEM", subsystem, 1);
+
+       dbg("exec: '%s' (%s)\n", devpath, path);
+
+       class_dev = sysfs_open_class_device_path(path);
+       if (class_dev == NULL) {
+               dbg ("sysfs_open_class_device_path failed");
+               return -ENODEV;
+       }
+
+       udev_init_device(&udev, devpath, subsystem);
+       udev_add_device(&udev, class_dev);
+
+       /* run dev.d/ scripts if we created a node or changed a netif name */
+       if (udev_dev_d && udev.devname[0] != '\0') {
+               setenv("DEVNAME", udev.devname, 1);
+               udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
+       }
+
+       sysfs_close_class_device(class_dev);
+       udev_cleanup_device(&udev);
+
+       return 0;
+}
+
+static void exec_list(struct list_head *device_list)
+{
+       struct device *loop_device;
+       struct device *tmp_device;
+       int i;
+
+       /* handle the "first" type devices first */
+       list_for_each_entry_safe(loop_device, tmp_device, device_list, list) {
+               for (i = 0; first_list[i] != NULL; i++) {
+                       if (strncmp(loop_device->path, first_list[i], strlen(first_list[i])) == 0) {
+                               add_device(loop_device->path, loop_device->subsys);
+                               list_del(&loop_device->list);
+                               free(loop_device);
+                               break;
+                       }
+               }
+       }
+
+       /* handle the devices we are allowed to, excluding the "last" type devices */
+       list_for_each_entry_safe(loop_device, tmp_device, device_list, list) {
+               int found = 0;
+               for (i = 0; last_list[i] != NULL; i++) {
+                       if (strncmp(loop_device->path, last_list[i], strlen(last_list[i])) == 0) {
+                               found = 1;
+                               break;
+                       }
+               }
+               if (found)
+                       continue;
+
+               add_device(loop_device->path, loop_device->subsys);
+               list_del(&loop_device->list);
+               free(loop_device);
+       }
+
+       /* handle the rest of the devices left over, if any */
+       list_for_each_entry_safe(loop_device, tmp_device, device_list, list) {
+               add_device(loop_device->path, loop_device->subsys);
+               list_del(&loop_device->list);
+               free(loop_device);
+       }
+}
+
+static int has_devt(const char *directory)
+{
+       char filename[NAME_SIZE];
+       struct stat statbuf;
+
+       snprintf(filename, NAME_SIZE, "%s/dev", directory);
+       filename[NAME_SIZE-1] = '\0';
+
+       if (stat(filename, &statbuf) == 0)
+               return 1;
+
+       return 0;
+}
+
+static void udev_scan_block(void)
+{
+       char base[NAME_SIZE];
+       DIR *dir;
+       struct dirent *dent;
+       LIST_HEAD(device_list);
+
+       snprintf(base, DEVPATH_SIZE, "%s/block", sysfs_path);
+       base[DEVPATH_SIZE-1] = '\0';
+
+       dir = opendir(base);
+       if (dir != NULL) {
+               for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
+                       char dirname[DEVPATH_SIZE];
+                       DIR *dir2;
+                       struct dirent *dent2;
+
+                       if (dent->d_name[0] == '.')
+                               continue;
+
+                       snprintf(dirname, NAME_SIZE, "%s/%s", base, dent->d_name);
+                       dirname[NAME_SIZE-1] = '\0';
+                       if (has_devt(dirname))
+                               device_list_insert(dirname, "block", &device_list);
+                       else
+                               continue;
+
+                       /* look for partitions */
+                       dir2 = opendir(dirname);
+                       if (dir2 != NULL) {
+                               for (dent2 = readdir(dir2); dent2 != NULL; dent2 = readdir(dir2)) {
+                                       char dirname2[DEVPATH_SIZE];
+
+                                       if (dent2->d_name[0] == '.')
+                                               continue;
+
+                                       snprintf(dirname2, DEVPATH_SIZE, "%s/%s", dirname, dent2->d_name);
+                                       dirname2[DEVPATH_SIZE-1] = '\0';
+
+                                       if (has_devt(dirname2))
+                                               device_list_insert(dirname2, "block", &device_list);
+                               }
+                               closedir(dir2);
+                       }
+               }
+               closedir(dir);
+       }
+       exec_list(&device_list);
+}
+
+static void udev_scan_class(void)
+{
+       char base[DEVPATH_SIZE];
+       DIR *dir;
+       struct dirent *dent;
+       LIST_HEAD(device_list);
+
+       snprintf(base, DEVPATH_SIZE, "%s/class", sysfs_path);
+       base[DEVPATH_SIZE-1] = '\0';
+
+       dir = opendir(base);
+       if (dir != NULL) {
+               for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
+                       char dirname[DEVPATH_SIZE];
+                       DIR *dir2;
+                       struct dirent *dent2;
+
+                       if (dent->d_name[0] == '.')
+                               continue;
+
+                       snprintf(dirname, DEVPATH_SIZE, "%s/%s", base, dent->d_name);
+                       dirname[DEVPATH_SIZE-1] = '\0';
+
+                       dir2 = opendir(dirname);
+                       if (dir2 != NULL) {
+                               for (dent2 = readdir(dir2); dent2 != NULL; dent2 = readdir(dir2)) {
+                                       char dirname2[DEVPATH_SIZE];
+
+                                       if (dent2->d_name[0] == '.')
+                                               continue;
+
+                                       snprintf(dirname2, DEVPATH_SIZE, "%s/%s", dirname, dent2->d_name);
+                                       dirname2[DEVPATH_SIZE-1] = '\0';
+
+                                       /* pass the net class as it is */
+                                       if (strcmp(dent->d_name, "net") == 0)
+                                               device_list_insert(dirname2, "net", &device_list);
+                                       else if (has_devt(dirname2))
+                                               device_list_insert(dirname2, dent->d_name, &device_list);
+                               }
+                               closedir(dir2);
+                       }
+               }
+               closedir(dir);
+       }
+       exec_list(&device_list);
+}
+
+static void asmlinkage sig_handler(int signum)
+{
+       switch (signum) {
+               case SIGALRM:
+                       exit(1);
+               case SIGINT:
+               case SIGTERM:
+                       exit(20 + signum);
+       }
+}
+
+int main(int argc, char *argv[], char *envp[])
+{
+       struct sigaction act;
+
+       udev_init_config();
+
+       /* set signal handlers */
+       memset(&act, 0x00, sizeof(act));
+       act.sa_handler = (void (*) (int))sig_handler;
+       sigemptyset (&act.sa_mask);
+       act.sa_flags = 0;
+       sigaction(SIGALRM, &act, NULL);
+       sigaction(SIGINT, &act, NULL);
+       sigaction(SIGTERM, &act, NULL);
+
+       /* trigger timeout to prevent hanging processes */
+       alarm(ALARM_TIMEOUT);
+
+       /* set environment for executed programs */
+       setenv("ACTION", "add", 1);
+       setenv("UDEV_START", "1", 1);
+
+       namedev_init();
+
+       udev_scan_block();
+       udev_scan_class();
+
+       return 0;
+}