From bc1a57b55269c3d15a00f39ec74243f50f1dfe88 Mon Sep 17 00:00:00 2001
From: Deepti Kulkarni <deepti@vyatta.com>
Date: Mon, 27 Feb 2012 05:05:37 -0800
Subject: fix for bug 7719 - delete system image should accept 'y' or 'n' for a
 yes/no respectively.

---
 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 2d53f1c..ef33658 100755
--- a/scripts/vyatta-boot-image.pl
+++ b/scripts/vyatta-boot-image.pl
@@ -481,7 +481,7 @@ sub doDelete {
   }
   chomp($resp);
   $resp = lc($resp);
-  if ($resp ne 'yes') {
+  if (($resp ne 'yes') && ($resp ne 'y')) {
     print "Image is NOT deleted. Exiting...\n";
     exit 1;
   }
-- 
cgit v1.2.3


From 578fdf8a545afca8fcc83bac884cc8b96c5e9bcc Mon Sep 17 00:00:00 2001
From: Deepti Kulkarni <deepti@vyatta.com>
Date: Mon, 27 Feb 2012 05:08:05 -0800
Subject: 0.13.240

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

diff --git a/debian/changelog b/debian/changelog
index e428c4b..915fa1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vyatta-op (0.13.240) unstable; urgency=low
+
+  * fix for bug 7719 - delete system image should accept 'y' or 'n'
+
+ -- Deepti Kulkarni <deepti@vyatta.com>  Mon, 27 Feb 2012 05:08:05 -0800
+
 vyatta-op (0.13.239) unstable; urgency=low
 
   * Bugfix 4053: implement bandwidth utilization montior commands 'mon
-- 
cgit v1.2.3


From 7c311d2ae5f37b50d0e41efb6160734a77dc4608 Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Tue, 28 Feb 2012 12:48:48 -0800
Subject: Bugfix 4053: add missing top level 'monitor interfaces'

---
 templates/monitor/interfaces/node.def | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/monitor/interfaces/node.def b/templates/monitor/interfaces/node.def
index 9adbd67..ef09ad0 100644
--- a/templates/monitor/interfaces/node.def
+++ b/templates/monitor/interfaces/node.def
@@ -1 +1,2 @@
 help: Monitor interfaces
+run: bmon -p  !gre0,!sit0,!tunl0,!ip6tnl0;
-- 
cgit v1.2.3


From 12ae7e30f0a67ef43a012f86df663e00cc9dbb85 Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Tue, 28 Feb 2012 12:49:20 -0800
Subject: 0.13.241

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

diff --git a/debian/changelog b/debian/changelog
index 915fa1e..a2d04ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vyatta-op (0.13.241) unstable; urgency=low
+
+  * Bugfix 4053: add missing top level 'monitor interfaces'
+
+ -- John Southworth <john.southworth@vyatta.com>  Tue, 28 Feb 2012 12:49:20 -0800
+
 vyatta-op (0.13.240) unstable; urgency=low
 
   * fix for bug 7719 - delete system image should accept 'y' or 'n'
-- 
cgit v1.2.3


From e71405abbaa7032434a5c114a4a92ff8896e1bdb Mon Sep 17 00:00:00 2001
From: Deepti Kulkarni <deepti@vyatta.com>
Date: Wed, 29 Feb 2012 06:14:18 -0800
Subject: bug fix for 7826 - fixed to use correct perl functions.

---
 scripts/rename-image.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/rename-image.pl b/scripts/rename-image.pl
index be30967..6f3084c 100644
--- a/scripts/rename-image.pl
+++ b/scripts/rename-image.pl
@@ -119,10 +119,10 @@ while ($line = <$grubfh>) {
 close($tmpfh);
 close($grubfh);
 
-mv("$image_path/$old_name", "$image_path/$new_name")
+move("$image_path/$old_name", "$image_path/$new_name")
     or die "rename $old_name to $new_name failed: $!\n";
 
-cp($tmpfilename, "$image_path/grub/grub.cfg")
+copy($tmpfilename, "$image_path/grub/grub.cfg")
     or die "copy $tmpfilename to grub.cfg failed: $!\n";
 
 syslog("warning", "System image $old_name has been renamed $new_name");
-- 
cgit v1.2.3


From 17b695105b5beb70eb5fd2b6433e521878e7aa41 Mon Sep 17 00:00:00 2001
From: Deepti Kulkarni <deepti@vyatta.com>
Date: Wed, 29 Feb 2012 06:15:52 -0800
Subject: 0.13.242

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

diff --git a/debian/changelog b/debian/changelog
index a2d04ce..2a60b98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vyatta-op (0.13.242) unstable; urgency=low
+
+  * bug fix for 7826 - fixed to use correct perl functions.
+
+ -- Deepti Kulkarni <deepti@vyatta.com>  Wed, 29 Feb 2012 06:15:51 -0800
+
 vyatta-op (0.13.241) unstable; urgency=low
 
   * Bugfix 4053: add missing top level 'monitor interfaces'
-- 
cgit v1.2.3