diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-01-19 17:22:13 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-01-19 17:22:13 -0800 |
| commit | 9d6702bf32bd7ca2a82c78b5f76802c6ca619d6f (patch) | |
| tree | aaa30f4fd166f063e9aa8716aff581bc3a006163 | |
| parent | ad3043d38a0c6a1123e82a994dd395e0f8c89ea4 (diff) | |
| parent | 78c20cbfac9a8839402e396314a10c5d8a701f23 (diff) | |
| download | vyatta-cfg-quagga-9d6702bf32bd7ca2a82c78b5f76802c6ca619d6f.tar.gz vyatta-cfg-quagga-9d6702bf32bd7ca2a82c78b5f76802c6ca619d6f.zip | |
Merge branch 'kenwood' of suva.vyatta.com:/git/vyatta-cfg-system into kenwood
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | scripts/vyatta_net_name | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index fff93718..f8439cc0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vyatta-cfg-system (0.16.19) unstable; urgency=low + + [ Jon Andersson ] + * Restiction on filtering of udev rules + + -- Stig Thormodsrud <stig@vyatta.com> Tue, 19 Jan 2010 17:01:50 -0800 + vyatta-cfg-system (0.16.18) unstable; urgency=low [ Stephen Hemminger ] diff --git a/scripts/vyatta_net_name b/scripts/vyatta_net_name index 54f91f04..7a4420ad 100755 --- a/scripts/vyatta_net_name +++ b/scripts/vyatta_net_name @@ -114,7 +114,7 @@ finish () # out from under us. Remove the subject line plus the comment # line above it if [ -e $udev_persistent_net_rules_file ]; then - sed -i -e "/^#/N;/${address}/d" $udev_persistent_net_rules_file + sed -i -e "/^#/N;/${address}.*NAME/d" $udev_persistent_net_rules_file fi exit $? |