From 537585b5e1a7d73f7c88b7726d0c1f112329bea3 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 21 Dec 2011 17:32:51 -0800 Subject: interfaces: don't add config for missing devices If device disappears or is renamed between the time udev script is run, and the vyatta-router script is run; then don't add an entry to the config file. --- scripts/system/vyatta_interface_rescan | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/system/vyatta_interface_rescan b/scripts/system/vyatta_interface_rescan index 5b72a480..eb45da60 100755 --- a/scripts/system/vyatta_interface_rescan +++ b/scripts/system/vyatta_interface_rescan @@ -115,6 +115,13 @@ sub interface_rescan { foreach my $ifname (sort @interfaces) { my $hwaddr = get_hwid("$VYATTAUDEV/$ifname"); + + # Ignore devices that disappear (or get renamed) + unless (-d "/sys/class/net/$ifname") { + syslog(LOG_INFO, "%s: does not exist", $ifname); + next; + } + unless (persistent_address($hwaddr)) { syslog(LOG_NOTICE, "%s: skipping address %s is not persistent", $ifname, $hwaddr); -- cgit v1.2.3 From 2c24b7ff7156bf2fbf6c67e30c0407d5a71c4449 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 21 Dec 2011 17:44:38 -0800 Subject: install: fix warning message when package is updated vyatta-cfg-system package installation caused warning: update-rc.d: using dependency based boot sequencing update-rc.d: warning: vyatta-config-reboot-params start runlevel arguments (2 3 4 5) do not match LSB Default-Start values (S) update-rc.d: warning: vyatta-config-reboot-params stop runlevel arguments (0 1 6) do not match LSB Default-Stop values (none) --- debian/vyatta-cfg-system.postinst.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index cc412632..2595aec1 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -217,7 +217,7 @@ do done # add vyatta-config-reboot-params to start at boot up -update-rc.d vyatta-config-reboot-params defaults +update-rc.d vyatta-config-reboot-params start 20 S # Local Variables: # mode: shell-script -- cgit v1.2.3 From e163a558e30b574703b3d083b98c02fe6124ec99 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 21 Dec 2011 17:53:56 -0800 Subject: 0.19.149 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index ad53c25e..646f7720 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vyatta-cfg-system (0.19.149) unstable; urgency=low + + * interfaces: don't add config for missing devices + * install: fix warning message when package is updated + + -- Stephen Hemminger Wed, 21 Dec 2011 17:53:56 -0800 + vyatta-cfg-system (0.19.148) unstable; urgency=low * Extra grat. arps are not needed for vmac interfaces -- cgit v1.2.3