diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | RELEASE-NOTES | 5 | ||||
| -rw-r--r-- | TODO | 4 | ||||
| -rwxr-xr-x | test/udevstart-test.pl | 61 | ||||
| -rw-r--r-- | udevstart.c | 359 |
6 files changed, 5 insertions, 427 deletions
diff --git a/.gitignore b/.gitignore index d21eb7bf03..ae9c0fe4ec 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ *.a udevd udevadm -udevstart udev_version.h test-udev @@ -45,7 +45,6 @@ V = PROGRAMS = \ udevd \ udevadm \ - udevstart \ test-udev HEADERS = \ @@ -314,7 +313,6 @@ uninstall: uninstall-bin uninstall-man test tests: all @ cd test && ./udev-test.pl - @ cd test && ./udevstart-test.pl .PHONY: test tests buildtest: diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 1b68833253..249ec95915 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -1,3 +1,8 @@ +udev 118 +======== +udevstart is removed from the tree, it did not get installed for +a long time now and is long replaced by trigger and settle. + udev 117 ======== Bugfixes. @@ -8,10 +8,6 @@ These things will change in future udev versions: These things are deprecated and scheduled for removal in a future udev version: - o remove udevstart - (we rely on the kernel "uevent"-triggers of kernel 2.6.15 and no longer - want to guess event-properties from sysfs like udevstart is doing it) - o remove man page symlinks for old tool names o some day, remove the symlinks to udevadm diff --git a/test/udevstart-test.pl b/test/udevstart-test.pl deleted file mode 100755 index 6829bc05cf..0000000000 --- a/test/udevstart-test.pl +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/perl - -# udevstart-test -# -# runs udevstart in a temporary directory with our test sysfs-tree -# and counts the created nodes to compare it with the expected numbers. -# -# Kay Sievers <kay.sievers@vrfy.org>, 2005 -# - -use warnings; -use strict; - -my $PWD = $ENV{PWD}; -my $sysfs = "sys/"; -my $udevstart_bin = "../udevstart"; -my $udev_root = "udev-root/"; # !!! directory will be removed !!! -my $udev_db = ".udevdb"; -my $udev_conf = "udev-test.conf"; -my $udev_rules = "udev-test.rules"; - -# set env -$ENV{SYSFS_PATH} = $sysfs; -$ENV{UDEV_CONFIG_FILE} = $udev_conf; - -# due to mknod restrictions -if (!($<==0)) { - print "Must have root permissions to run properly.\n"; - exit; -} - -# prepare -system("rm -rf $udev_root"); -mkdir($udev_root) || die "unable to create udev_root: $udev_root\n"; - -# create config file -open CONF, ">$udev_conf" || die "unable to create config file: $udev_conf"; -print CONF "udev_root=\"$udev_root\"\n"; -print CONF "udev_db=\"$udev_db\"\n"; -print CONF "udev_rules=\"$udev_rules\"\n"; -close CONF; - -# create rules file -open RULES, ">$udev_rules" || die "unable to create rules file: $udev_rules"; -print RULES "\n"; -close RULES; - -system("$udevstart_bin"); -my $block = int(`find $udev_root -type b -print | wc -l`); -my $char = int(`find $udev_root -type c -print | wc -l`); - -print "block devices: $block/10\n"; -print "char devices: $char/91\n"; -print "\n"; - -# cleanup -system("rm -rf $udev_db"); -system("rm -rf $udev_root"); -unlink($udev_rules); -unlink($udev_conf); - diff --git a/udevstart.c b/udevstart.c deleted file mode 100644 index 66b96a2186..0000000000 --- a/udevstart.c +++ /dev/null @@ -1,359 +0,0 @@ -/* - * quick and dirty way to populate a /dev directory - * - * Copyright (C) 2004 Harald Hoyer <harald@redhat.com> - * Copyright (C) 2004 Greg Kroah-Hartman <greg@kroah.com> - * Copyright (C) 2004-2006 Kay Sievers <kay@vrfy.org> - * - * 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., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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 <syslog.h> -#include <sys/wait.h> -#include <sys/stat.h> -#include <sys/types.h> - -#include "udev.h" -#include "udev_rules.h" -#include "udev_selinux.h" - -static const char *udev_run_str; -static const char *udev_log_str; -static struct udev_rules rules; - -#ifdef USE_LOG -void log_message(int priority, const char *format, ...) -{ - va_list args; - - if (priority > udev_log_priority) - return; - - va_start(args, format); - vsyslog(priority, format, args); - va_end(args); -} -#endif - -struct device { - struct list_head node; - char path[PATH_SIZE]; -}; - -/* sort files in lexical order */ -static int device_list_insert(const char *path, struct list_head *device_list) -{ - struct device *loop_device; - struct device *new_device; - const char *devpath = &path[strlen(sysfs_path)]; - - dbg("insert: '%s'", devpath); - - list_for_each_entry(loop_device, device_list, node) { - if (strcmp(loop_device->path, devpath) > 0) { - break; - } - } - - new_device = malloc(sizeof(struct device)); - if (new_device == NULL) { - dbg("error malloc"); - return -ENOMEM; - } - - strlcpy(new_device->path, devpath, sizeof(new_device->path)); - list_add_tail(&new_device->node, &loop_device->node); - dbg("add '%s'" , new_device->path); - 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", - "/class/tty", - NULL, -}; - -static int add_device(const char *devpath) -{ - struct sysfs_device *dev; - struct udevice *udev; - int retval = 0; - - /* clear and set environment for next event */ - clearenv(); - setenv("ACTION", "add", 1); - setenv("UDEV_START", "1", 1); - if (udev_log_str) - setenv("UDEV_LOG", udev_log_str, 1); - if (udev_run_str) - setenv("UDEV_RUN", udev_run_str, 1); - - dev = sysfs_device_get(devpath); - if (dev == NULL) - return -1; - - udev = udev_device_init(NULL); - if (udev == NULL) - return -1; - - /* override built-in sysfs device */ - udev->dev = dev; - strcpy(udev->action, "add"); - - if (strcmp(udev->dev->subsystem, "net") != 0) { - udev->devt = udev_device_get_devt(udev); - if (major(udev->devt) == 0) - return -1; - } - - dbg("add '%s'", udev->dev->devpath); - setenv("DEVPATH", udev->dev->devpath, 1); - setenv("SUBSYSTEM", udev->dev->subsystem, 1); - - udev_rules_get_name(&rules, udev); - if (udev->ignore_device) { - dbg("device event will be ignored"); - goto exit; - } - if (udev->name[0] != '\0') - retval = udev_device_event(&rules, udev); - else - info("device node creation supressed"); - - if (retval == 0 && udev_run) - udev_rules_run(udev); - -exit: - udev_device_cleanup(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, node) { - 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); - list_del(&loop_device->node); - 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, node) { - 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); - list_del(&loop_device->node); - free(loop_device); - } - - /* handle the rest of the devices left over, if any */ - list_for_each_entry_safe(loop_device, tmp_device, device_list, node) { - add_device(loop_device->path); - list_del(&loop_device->node); - free(loop_device); - } -} - -static int has_devt(const char *path) -{ - char filename[PATH_SIZE]; - struct stat statbuf; - - snprintf(filename, sizeof(filename), "%s/dev", path); - filename[sizeof(filename)-1] = '\0'; - - if (stat(filename, &statbuf) == 0) - return 1; - - return 0; -} - -static void udev_scan_block(struct list_head *device_list) -{ - char base[PATH_SIZE]; - DIR *dir; - struct dirent *dent; - - snprintf(base, sizeof(base), "%s/block", sysfs_path); - base[sizeof(base)-1] = '\0'; - - dir = opendir(base); - if (dir != NULL) { - for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) { - char dirname[PATH_SIZE]; - DIR *dir2; - struct dirent *dent2; - - if (dent->d_name[0] == '.') - continue; - - snprintf(dirname, sizeof(dirname), "%s/%s", base, dent->d_name); - dirname[sizeof(dirname)-1] = '\0'; - if (has_devt(dirname)) - device_list_insert(dirname, device_list); - else - continue; - - /* look for partitions */ - dir2 = opendir(dirname); - if (dir2 != NULL) { - for (dent2 = readdir(dir2); dent2 != NULL; dent2 = readdir(dir2)) { - char dirname2[PATH_SIZE]; - - if (dent2->d_name[0] == '.') - continue; - - snprintf(dirname2, sizeof(dirname2), "%s/%s", dirname, dent2->d_name); - dirname2[sizeof(dirname2)-1] = '\0'; - - if (has_devt(dirname2)) - device_list_insert(dirname2, device_list); - } - closedir(dir2); - } - } - closedir(dir); - } -} - -static void udev_scan_class(struct list_head *device_list) -{ - char base[PATH_SIZE]; - DIR *dir; - struct dirent *dent; - - snprintf(base, sizeof(base), "%s/class", sysfs_path); - base[sizeof(base)-1] = '\0'; - - dir = opendir(base); - if (dir != NULL) { - for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) { - char dirname[PATH_SIZE]; - DIR *dir2; - struct dirent *dent2; - - if (dent->d_name[0] == '.') - continue; - - snprintf(dirname, sizeof(dirname), "%s/%s", base, dent->d_name); - dirname[sizeof(dirname)-1] = '\0'; - - dir2 = opendir(dirname); - if (dir2 != NULL) { - for (dent2 = readdir(dir2); dent2 != NULL; dent2 = readdir(dir2)) { - char dirname2[PATH_SIZE]; - - if (dent2->d_name[0] == '.') - continue; - - snprintf(dirname2, sizeof(dirname2), "%s/%s", dirname, dent2->d_name); - dirname2[sizeof(dirname2)-1] = '\0'; - - if (has_devt(dirname2) || strcmp(dent->d_name, "net") == 0) - device_list_insert(dirname2, device_list); - } - closedir(dir2); - } - } - closedir(dir); - } -} - -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[]) -{ - LIST_HEAD(device_list); - struct sigaction act; - - logging_init("udevstart"); - udev_config_init(); - selinux_init(); - dbg("version %s", UDEV_VERSION); - - udev_run_str = getenv("UDEV_RUN"); - udev_log_str = getenv("UDEV_LOG"); - - /* disable all logging if not explicitely requested */ - if (udev_log_str == NULL) - udev_log_priority = 0; - - /* 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(UDEV_ALARM_TIMEOUT); - - sysfs_init(); - udev_rules_init(&rules, 1); - - udev_scan_class(&device_list); - udev_scan_block(&device_list); - exec_list(&device_list); - - udev_rules_cleanup(&rules); - sysfs_cleanup(); - selinux_exit(); - logging_close(); - return 0; -} |