diff options
| author | John Southworth <john.southworth@vyatta.com> | 2012-03-01 00:54:04 +0000 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2012-03-01 00:54:04 +0000 |
| commit | e7eb5130f92f84160a78575713fa1674d5fdac9c (patch) | |
| tree | 579dda2dd3fd8e38eb8c83a011c8295380f49f9c /scripts | |
| parent | 18dc119573592a0c6fbf224c0b75c25b3c967af1 (diff) | |
| parent | 17b695105b5beb70eb5fd2b6433e521878e7aa41 (diff) | |
| download | vyatta-op-e7eb5130f92f84160a78575713fa1674d5fdac9c.tar.gz vyatta-op-e7eb5130f92f84160a78575713fa1674d5fdac9c.zip | |
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-op into oxnard
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/rename-image.pl | 4 | ||||
| -rwxr-xr-x | scripts/vyatta-boot-image.pl | 2 |
2 files changed, 3 insertions, 3 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"); 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; } |