[PATCH] udev - CALLOUT is PROGRAM now

replace CALLOUT by PROGRAM and fix old rule format

diff --git a/etc/udev/udev.rules b/etc/udev/udev.rules
index 6cb48967434cc91d616999b64866f043098764ab..a2279976fe28794e05b9b6dd3cba19fb6f38a52a 100644 (file)
--- a/etc/udev/udev.rules
+++ b/etc/udev/udev.rules
@@ -6,7 +6,7 @@
 # %M - the kernel major number for the device
 # %m - the kernel minor number for the device
 # %b - the bus id for the device
-# %c - the return value for the CALLOUT program (note, this doesn't work within
+# %c - the return value of the external PROGRAM (note, this doesn't work within
 #      the PROGRAM field for the obvious reason.)
 # %D - use the devfs style disk name for this device.
 #      For partitions, this will result in 'part%n'

diff --git a/etc/udev/udev.rules.devfs b/etc/udev/udev.rules.devfs
index 3c45db79cfd2c55e3e15794b1412901d7cd3ac38..bc3f26c1ccd992839df7d7f5c73cfc9c7f63f989 100644 (file)
--- a/etc/udev/udev.rules.devfs
+++ b/etc/udev/udev.rules.devfs
@@ -9,7 +9,7 @@
 # %M - the kernel major number for the device
 # %m - the kernel minor number for the device
 # %b - the bus id for the device
-# %c - the return value for the CALLOUT program (note, this doesn't work within
+# %c - the return value of the external PROGRAM (note, this doesn't work within
 #      the PROGRAM field for the obvious reason.)
 # %D - use the devfs style disk name for this device.
 #      For partitions, this will result in 'part%n'

diff --git a/etc/udev/udev.rules.gentoo b/etc/udev/udev.rules.gentoo
index 4a3292853fdbbe6d5542f24fd93cc472595e6cc9..a449a4dac961acbb4b61b7abb3d1fe6e465d0d69 100644 (file)
--- a/etc/udev/udev.rules.gentoo
+++ b/etc/udev/udev.rules.gentoo
@@ -9,7 +9,7 @@
 # %M - the kernel major number for the device
 # %m - the kernel minor number for the device
 # %b - the bus id for the device
-# %c - the return value for the CALLOUT program (note, this doesn't work within
+# %c - the return value of the external PROGRAM (note, this doesn't work within
 #      the PROGRAM field for the obvious reason.)
 # %D - use the devfs style disk name for this device.
 #      For partitions, this will result in 'part%n'

diff --git a/extras/ide-devfs.sh b/extras/ide-devfs.sh
index 57fb00b6766aae31b9953c7f7753576caa623a9d..ab194b01e65274c595d1164ac0482a6b69c9220d 100644 (file)
--- a/extras/ide-devfs.sh
+++ b/extras/ide-devfs.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# udev CALLOUT script
+# udev external PROGRAM script
 # return devfs-names for ide-devices
-# CALLOUT, BUS="ide", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", ID="hd*", NAME="%1c", SYMLINK="%2c %3c"
+# BUS="ide", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", RESULT="hd*", NAME="%1c", SYMLINK="%2c %3c"
 
 HOST="${2%\.[0-9]}"
 TARGET="${2#[0-9]\.}"

diff --git a/extras/name_cdrom.pl b/extras/name_cdrom.pl
index 7a14e866a623884e246c3cef8982caace4978f2f..e522c9fda839e496a2a088d946a00a2a3da79bf4 100644 (file)
--- a/extras/name_cdrom.pl
+++ b/extras/name_cdrom.pl
@@ -2,8 +2,8 @@
 
 # a horribly funny script that shows how flexible udev can really be
 # This is to be executed by udev with the following rules:
-# CALLOUT, BUS="ide", PROGRAM="name_cdrom.pl %M %m", ID="good*", NAME="%2c", SYMLINK="cdrom"
-# CALLOUT, BUS="scsi", PROGRAM="name_cdrom.pl %M %m", ID="good*", NAME="%2c", SYMLINK="cdrom"
+# BUS="ide", PROGRAM="name_cdrom.pl %M %m", PROGRAM="good*", NAME="%2c", SYMLINK="cdrom"
+# BUS="scsi", PROGRAM="name_cdrom.pl %M %m", PROGRAM="good*", NAME="%2c", SYMLINK="cdrom"
 #
 # The scsi rule catches USB cdroms and ide-scsi devices.
 #

diff --git a/namedev.c b/namedev.c
index fdc6252bf66fa46583ca97b4b9fab0389b12bb12..6f7bfb6805826085cc0ecaff165f9f5937075251 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -309,7 +309,7 @@ static int execute_program(char *path, char *value, int len)
        int value_set = 0;
        char buffer[256];
        char *pos;
-       char *args[CALLOUT_MAXARG];
+       char *args[PROGRAM_MAXARG];
        int i;
 
        dbg("executing '%s'", path);
@@ -331,7 +331,7 @@ static int execute_program(char *path, char *value, int len)
                if (strchr(path, ' ')) {
                        /* exec with arguments */
                        pos = path;
-                       for (i=0; i < CALLOUT_MAXARG-1; i++) {
+                       for (i=0; i < PROGRAM_MAXARG-1; i++) {
                                args[i] = strsep(&pos, " ");
                                if (args[i] == NULL)
                                        break;

diff --git a/namedev.h b/namedev.h
index 4e75db64107a7fe5c6e519bcbc08b3ab49e733f1..f5b63a8805ee728986dcf609eb203beafaf5e06d 100644 (file)
--- a/namedev.h
+++ b/namedev.h
@@ -45,7 +45,7 @@ struct sysfs_class_device;
 #define FIELD_NAME     "NAME"
 #define FIELD_SYMLINK  "SYMLINK"
 
-#define CALLOUT_MAXARG 10
+#define PROGRAM_MAXARG 10
 #define MAX_SYSFS_PAIRS        5
 
 struct sysfs_pair {