diff options
| author | Bob Gilligan <gilligan@vyatta.com> | 2011-01-16 22:44:12 -0800 |
|---|---|---|
| committer | Bob Gilligan <gilligan@vyatta.com> | 2011-01-16 23:07:47 -0800 |
| commit | 4d155cbf37ca909daff06dd8c7119274d0861f6c (patch) | |
| tree | fe9d460fb46097986fe234fddb3f9bd2935c8642 /biosdevname.rules.in | |
| parent | 9405281a9e16e55af687c98a83d327946953cc09 (diff) | |
| download | vyatta-biosdevname-4d155cbf37ca909daff06dd8c7119274d0861f6c.tar.gz vyatta-biosdevname-4d155cbf37ca909daff06dd8c7119274d0861f6c.zip | |
Merge upstream version 0.3.4.
(cherry picked from commit 21eb1c8d6fefa5dcd3a9a800b4add06d5c30c01f)
Diffstat (limited to 'biosdevname.rules.in')
| -rw-r--r-- | biosdevname.rules.in | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/biosdevname.rules.in b/biosdevname.rules.in index 6159382..a3be69c 100644 --- a/biosdevname.rules.in +++ b/biosdevname.rules.in @@ -1,7 +1,9 @@ -KERNEL!="eth*", GOTO="biosdevname_end" -ACTION!="add", GOTO="biosdevname_end" -NAME=="?*", GOTO="biosdevname_end" +SUBSYSTEM!="net", GOTO="netdevicename_end" +KERNEL!="eth*", GOTO="netdevicename_end" +ACTION!="add", GOTO="netdevicename_end" -PROGRAM="/sbin/biosdevname --policy=all_ethN -i %k", ENV{INTERFACE_NAME}="%c" +# using NAME= instead of setting INTERFACE_NAME, so that persistent +# names aren't generated for these devices, they are "named" on each boot. +PROGRAM="/sbin/biosdevname --policy physical -i %k", NAME="%c", OPTIONS+="string_escape=replace" -LABEL="biosdevname_end" +LABEL="netdevicename_end" |