From f7f9f099818f0d5fd30152625b1b941dcad22c8b Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Mon, 9 Apr 2012 21:19:14 -0700
Subject: Use Interface.pm to find interface state

Bug 8006
Use standard module to check for interface state.
---
 scripts/vyatta-show-interfaces.pl | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/scripts/vyatta-show-interfaces.pl b/scripts/vyatta-show-interfaces.pl
index 5a56050..36428cb 100755
--- a/scripts/vyatta-show-interfaces.pl
+++ b/scripts/vyatta-show-interfaces.pl
@@ -119,18 +119,14 @@ sub get_ipaddr {
 }
 
 sub get_state_link {
-    my $intf = shift;
+    my $name = shift;
+    my $intf = new Vyatta::Interface($name);
     my $state;
     my $link = 'down';
-    my $flags = get_sysfs_value($intf, 'flags');
 
-    my $hex_flags = hex($flags);
-    if ($hex_flags & 0x1) {	  # IFF_UP
+    if ($intf->up()) {
 	$state = 'up'; 
-	my $carrier = get_sysfs_value($intf, 'carrier');
-	if ($carrier eq '1') {
-	    $link = "up"; 
-	}
+	$link = "up" if ($intf->running());
     } else {
 	$state = "admin down";
     }
-- 
cgit v1.2.3


From 558862b588b518f6a50fddc7c942593b9392cedb Mon Sep 17 00:00:00 2001
From: Deepti Kulkarni <deepti@vyatta.com>
Date: Tue, 10 Apr 2012 09:51:48 -0700
Subject: fix to use the correct perl function

---
 scripts/vyatta-boot-image.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/vyatta-boot-image.pl b/scripts/vyatta-boot-image.pl
index 19df5a2..555496b 100755
--- a/scripts/vyatta-boot-image.pl
+++ b/scripts/vyatta-boot-image.pl
@@ -192,7 +192,7 @@ sub deleteGrubEntries {
   die "Failed to modify GRUB configuration\n"
     if (!defined($p) || !chmod(($p & oct(7777)), $tfile));
 
-  mv($tfile, $grub_cfg)
+  move($tfile, $grub_cfg)
     or die "Failed to delete GRUB entries\n";
 }
 
-- 
cgit v1.2.3


From aa8173ab2ab92390abc11d43a6895c9b2f5cd8be Mon Sep 17 00:00:00 2001
From: Deepti Kulkarni <deepti@vyatta.com>
Date: Tue, 10 Apr 2012 09:53:17 -0700
Subject: 0.13.250

---
 debian/changelog | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6d5ea46..16a3ec2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+vyatta-op (0.13.250) unstable; urgency=low
+
+  [ Stephen Hemminger ]
+  * Better perl style in boot image
+
+  [ Deepti Kulkarni ]
+  * fix to use the correct perl function
+
+ -- Deepti Kulkarni <deepti@vyatta.com>  Tue, 10 Apr 2012 09:53:16 -0700
+
 vyatta-op (0.13.249) unstable; urgency=low
 
   * Make ping feel like all the other system commands
-- 
cgit v1.2.3


From df76a73c764180ca6793f647ccc9e4a32a197b87 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Tue, 10 Apr 2012 18:30:36 -0700
Subject: 0.13.251

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 16a3ec2..c76b99a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vyatta-op (0.13.251) unstable; urgency=low
+
+  * Use Interface.pm to find interface state
+
+ -- Stephen Hemminger <shemminger@vyatta.com>  Tue, 10 Apr 2012 18:30:35 -0700
+
 vyatta-op (0.13.250) unstable; urgency=low
 
   [ Stephen Hemminger ]
-- 
cgit v1.2.3