ac28b86d63
> Hi, > as promised yesterday, here is a patch that drops the explicit methods > given in the udev config and implement only one type of rule. > > A rule now consists only of a number of keys to match. All known keys > are valid in any combination. The former configs should work with a few > changes: > > o the "<METHOD>, " at the beginning of the line should be removed > > o the result of the externel program is matched with RESULT= instead if ID= > the PROGRAM= key is only valid if the program exits with zero > (just exit with nozero in a script if the rule should not match) > > o rules are processed in order they appear in the file, no priority > > o if NAME="" is given, udev is instructed to ignore this device, > no node will be created > > > EXAMPLE: > > # combined BUS, SYSFS and KERNEL > BUS="usb", KERNEL="video*", SYSFS_model="Creative Labs WebCam*", NAME="test/webcam%n" > > # exec script only for the first ide drive (hda), all other will be skipped > BUS="ide", KERNEL="hda*", PROGRAM="/home/kay/src/udev.kay/extras/ide-devfs.sh %k %b %n", RESULT="hd*", NAME="%1c", SYMLINK="%2c %3c" > > > The udev-test.pl and test.block works fine here. > Please adapt your config and give it a try. > Here is a slightly better version of the patch. After a conversation with Patrick, we are now able to execute the PROGRAM and also match in all following rules with the RESULT value from this exec. EXAMPLE: We have 7 rules with RESULT and 2 with PROGRAM. Only the 5th rule matches with the callout result from the exec in the 4th rule. RULES: PROGRAM="/bin/echo abc", RESULT="no_match", NAME="web-no-2" KERNEL="video*", RESULT="123", NAME="web-no-3" KERNEL="video*", RESULT="123", NAME="web-no-4" PROGRAM="/bin/echo 123", RESULT="no_match", NAME="web-no-5" KERNEL="video*", RESULT="123", NAME="web-yes" RESULT: Jan 11 23:36:52 pim udev[26050]: namedev_name_device: process rule Jan 11 23:36:52 pim udev[26050]: namedev_name_device: check PROGRAM Jan 11 23:36:52 pim udev[26050]: execute_program: executing '/bin/echo abc' Jan 11 23:36:52 pim udev[26050]: execute_program: result is 'abc' Jan 11 23:36:52 pim udev[26050]: namedev_name_device: PROGRAM returned successful Jan 11 23:36:52 pim udev[26050]: namedev_name_device: check for RESULT dev->result='no_match', udev->program_result='abc' Jan 11 23:36:52 pim udev[26050]: namedev_name_device: RESULT is not matching Jan 11 23:36:52 pim udev[26050]: namedev_name_device: process rule Jan 11 23:36:52 pim udev[26050]: namedev_name_device: check for KERNEL dev->kernel='video*' class_dev->name='video0' Jan 11 23:36:52 pim udev[26050]: namedev_name_device: KERNEL matches Jan 11 23:36:52 pim udev[26050]: namedev_name_device: check for RESULT dev->result='123', udev->program_result='abc' Jan 11 23:36:52 pim udev[26050]: namedev_name_device: RESULT is not matching Jan 11 23:36:52 pim udev[26050]: namedev_name_device: process rule Jan 11 23:36:52 pim udev[26050]: namedev_name_device: check for KERNEL dev->kernel='video*' class_dev->name='video0' Jan 11 23:36:52 pim udev[26050]: namedev_name_device: KERNEL matches Jan 11 23:36:52 pim udev[26050]: namedev_name_device: check for RESULT dev->result='123', udev->program_result='abc' Jan 11 23:36:52 pim udev[26050]: namedev_name_device: RESULT is not matching Jan 11 23:36:52 pim udev[26050]: namedev_name_device: process rule Jan 11 23:36:52 pim udev[26050]: namedev_name_device: check PROGRAM Jan 11 23:36:52 pim udev[26050]: execute_program: executing '/bin/echo 123' Jan 11 23:36:52 pim udev[26050]: execute_program: result is '123' Jan 11 23:36:52 pim udev[26050]: namedev_name_device: PROGRAM returned successful Jan 11 23:36:52 pim udev[26050]: namedev_name_device: check for RESULT dev->result='no_match', udev->program_result='123' Jan 11 23:36:52 pim udev[26050]: namedev_name_device: RESULT is not matching Jan 11 23:36:52 pim udev[26050]: namedev_name_device: process rule Jan 11 23:36:52 pim udev[26050]: namedev_name_device: check for KERNEL dev->kernel='video*' class_dev->name='video0' Jan 11 23:36:52 pim udev[26050]: namedev_name_device: KERNEL matches Jan 11 23:36:52 pim udev[26050]: namedev_name_device: check for RESULT dev->result='123', udev->program_result='123' Jan 11 23:36:52 pim udev[26050]: namedev_name_device: RESULT matches Jan 11 23:36:52 pim udev[26050]: namedev_name_device: found matching rule, 'video*' becomes '' Jan 11 23:36:52 pim udev[26050]: namedev_name_device: name, 'web-yes' is going to have owner='', group='', mode = 0600
96 lines
2.4 KiB
C
96 lines
2.4 KiB
C
/*
|
|
* namedev.h
|
|
*
|
|
* Userspace devfs
|
|
*
|
|
* Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.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.
|
|
*
|
|
*/
|
|
|
|
#ifndef NAMEDEV_H
|
|
#define NAMEDEV_H
|
|
|
|
#include "udev.h"
|
|
#include "list.h"
|
|
|
|
struct sysfs_class_device;
|
|
|
|
#define BUS_SIZE 30
|
|
#define FILE_SIZE 50
|
|
#define VALUE_SIZE 100
|
|
#define ID_SIZE 50
|
|
#define PLACE_SIZE 50
|
|
#define PROGRAM_SIZE 100
|
|
|
|
#define FIELD_BUS "BUS"
|
|
#define FIELD_SYSFS "SYSFS_"
|
|
#define FIELD_ID "ID"
|
|
#define FIELD_PLACE "PLACE"
|
|
#define FIELD_PROGRAM "PROGRAM"
|
|
#define FIELD_RESULT "RESULT"
|
|
#define FIELD_KERNEL "KERNEL"
|
|
#define FIELD_NAME "NAME"
|
|
#define FIELD_SYMLINK "SYMLINK"
|
|
|
|
#define CALLOUT_MAXARG 10
|
|
#define MAX_SYSFS_PAIRS 5
|
|
|
|
struct sysfs_pair {
|
|
char file[FILE_SIZE];
|
|
char value[VALUE_SIZE];
|
|
};
|
|
|
|
struct config_device {
|
|
struct list_head node;
|
|
|
|
char bus[BUS_SIZE];
|
|
char id[ID_SIZE];
|
|
char place[PLACE_SIZE];
|
|
char kernel[NAME_SIZE];
|
|
char program[PROGRAM_SIZE];
|
|
char result[PROGRAM_SIZE];
|
|
char name[NAME_SIZE];
|
|
char symlink[NAME_SIZE];
|
|
struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
|
|
};
|
|
|
|
struct perm_device {
|
|
struct list_head node;
|
|
|
|
char name[NAME_SIZE];
|
|
char owner[OWNER_SIZE];
|
|
char group[GROUP_SIZE];
|
|
mode_t mode;
|
|
};
|
|
|
|
extern struct list_head config_device_list;
|
|
extern struct list_head perm_device_list;
|
|
|
|
extern int namedev_init(void);
|
|
extern int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *dev);
|
|
extern int namedev_init_permissions(void);
|
|
extern int namedev_init_rules(void);
|
|
|
|
extern int add_perm_dev(struct perm_device *new_dev);
|
|
extern void dump_config_dev(struct config_device *dev);
|
|
extern void dump_config_dev_list(void);
|
|
extern void dump_perm_dev(struct perm_device *dev);
|
|
extern void dump_perm_dev_list(void);
|
|
|
|
extern int get_pair(char **orig_string, char **left, char **right);
|
|
|
|
#endif
|