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(-)

(limited to 'scripts')

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 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(-)

(limited to 'scripts')

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