From ea57f51819a358a6c1309cf028a1a2dcd90dd7a5 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 18 May 2012 11:39:57 +0200 Subject: mdev: when found, print major,minor into mdev.log Signed-off-by: Denys Vlasenko --- examples/mdev.conf | 10 ++++++++-- examples/mdev_fat.conf | 8 ++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'examples') diff --git a/examples/mdev.conf b/examples/mdev.conf index cdbb4fc..5179569 100644 --- a/examples/mdev.conf +++ b/examples/mdev.conf @@ -7,8 +7,14 @@ # instead of the default 0:0 660. # # Syntax: -# %s %d:%d %s -# devicename_regex user:group mode +# [-]devicename_regex user:group mode [=path]|[>path]|[!] [@|$|*cmd args...] +# [-]$ENVVAR=regex user:group mode [=path]|[>path]|[!] [@|$|*cmd args...] +# [-]@maj,min[-min2] user:group mode [=path]|[>path]|[!] [@|$|*cmd args...] +# +# [-]: do not stop on this match, continue reading mdev.conf +# =: move, >: move and create a symlink +# !: do not create device node +# @|$|*: run@cmd if $ACTION=add, $cmd if $ACTION=remove, *cmd in all cases null 0:0 666 zero 0:0 666 diff --git a/examples/mdev_fat.conf b/examples/mdev_fat.conf index df329b4..d67912b 100644 --- a/examples/mdev_fat.conf +++ b/examples/mdev_fat.conf @@ -7,10 +7,14 @@ # instead of the default 0:0 660. # # Syntax: -# [-]devicename_regex user:group mode [>|=path] [@|$|*cmd args...] +# [-]devicename_regex user:group mode [=path]|[>path]|[!] [@|$|*cmd args...] +# [-]$ENVVAR=regex user:group mode [=path]|[>path]|[!] [@|$|*cmd args...] +# [-]@maj,min[-min2] user:group mode [=path]|[>path]|[!] [@|$|*cmd args...] # +# [-]: do not stop on this match, continue reading mdev.conf # =: move, >: move and create a symlink -# @|$|*: run $cmd on delete, @cmd on create, *cmd on both +# !: do not create device node +# @|$|*: run cmd if $ACTION=remove, @cmd if $ACTION=add, *cmd in all cases # support module loading on hotplug $MODALIAS=.* root:root 660 @modprobe "$MODALIAS" -- cgit v1.1 From b6beada5a1432645090b441531b5909983cfbf10 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 18 May 2012 15:11:16 +0200 Subject: mdev: remove undocumented subsystem/devname matching hack It was colliding with matching of devnames with slashes. We need a more generic way to examine env.vars in rules anyway. Signed-off-by: Denys Vlasenko --- examples/mdev_fat.conf | 1 - 1 file changed, 1 deletion(-) (limited to 'examples') diff --git a/examples/mdev_fat.conf b/examples/mdev_fat.conf index d67912b..ceba3a7 100644 --- a/examples/mdev_fat.conf +++ b/examples/mdev_fat.conf @@ -53,7 +53,6 @@ sr[0-9]* root:cdrom 660 @ln -sf $MDEV cdrom fd[0-9]* root:floppy 660 # net devices --net/.* root:root 600 @nameif tun[0-9]* root:root 600 =net/ tap[0-9]* root:root 600 =net/ -- cgit v1.1