diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-10-07 13:14:48 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-10-07 13:14:48 -0700 |
| commit | 766bb0ca075060a8ebafbc57f499933f48aabdbe (patch) | |
| tree | 3dcb45f5558366474a00dd3abc15f82c496bd4e1 /sysconf/vyatta-net.rules | |
| parent | 3db21aa51d70c2cd8b4a1032d7d3aa0b8e0d55cd (diff) | |
| download | vyatta-cfg-system-766bb0ca075060a8ebafbc57f499933f48aabdbe.tar.gz vyatta-cfg-system-766bb0ca075060a8ebafbc57f499933f48aabdbe.zip | |
Change udev network naming to be more cooperative
Other udev scripts may have configured the device name before
the Vyatta script runs. Use the convention followed by the
standard persistent network name script; only applly name rules
if interface does not already have name assigned.
Diffstat (limited to 'sysconf/vyatta-net.rules')
| -rw-r--r-- | sysconf/vyatta-net.rules | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sysconf/vyatta-net.rules b/sysconf/vyatta-net.rules index f01c3d3c..9e874381 100644 --- a/sysconf/vyatta-net.rules +++ b/sysconf/vyatta-net.rules @@ -16,11 +16,10 @@ ACTION!="add", ACTION!="change", GOTO="vyatta_net_end" SUBSYSTEM!="net", GOTO="vyatta_net_end" -# Do name change for ethernet devices only. -# note that the original rule was checking "DRIVERS", which does not appear -# to be available (empty string) from the squeeze udev. skip the DRIVERS -# check for now. +# ignore the interface if a name has already been set +NAME=="?*", GOTO="vyatta_net_end" + +# Do name change for ethernet devices only KERNEL=="eth*", PROGRAM="vyatta_net_name %k $attr{address}", NAME="%c" LABEL="vyatta_net_end" - |