diff options
| author | John Southworth <john.southworth@vyatta.com> | 2012-02-28 12:49:20 -0800 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2012-02-28 12:49:20 -0800 |
| commit | ca8baa897fb4112902556b5f4f95187552c99013 (patch) | |
| tree | 4ecdead9d550c4dd23e5110cc8993c0cd5fae334 | |
| parent | 7c311d2ae5f37b50d0e41efb6160734a77dc4608 (diff) | |
| parent | 578fdf8a545afca8fcc83bac884cc8b96c5e9bcc (diff) | |
| download | vyatta-op-ca8baa897fb4112902556b5f4f95187552c99013.tar.gz vyatta-op-ca8baa897fb4112902556b5f4f95187552c99013.zip | |
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-op into oxnard
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | scripts/vyatta-boot-image.pl | 2 |
2 files changed, 7 insertions, 1 deletions
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 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; } |