summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaurav Sinha <gaurav.sinha@vyatta.com>2012-11-17 00:57:57 -0800
committerGaurav Sinha <gaurav.sinha@vyatta.com>2012-11-19 10:24:55 -0800
commited9540b4a92d2abb6719d36418f3827ac313a59d (patch)
tree6c450157893bc7cdc790799da87339504249f9e1
parentfffe09f9d7a53d5d74bae6bafc2c7b7409a4babf (diff)
downloadvyatta-cfg-firewall-ed9540b4a92d2abb6719d36418f3827ac313a59d.tar.gz
vyatta-cfg-firewall-ed9540b4a92d2abb6719d36418f3827ac313a59d.zip
Add signal handler to handle CTRL+C to avoid commit blockade on lock file
(cherry picked from commit 69de682b364d7bce7aefecb00a4e06eceaeb834d)
-rwxr-xr-xlib/Vyatta/IpTables/IpSet.pm9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/Vyatta/IpTables/IpSet.pm b/lib/Vyatta/IpTables/IpSet.pm
index 5c4b6ce..729c58e 100755
--- a/lib/Vyatta/IpTables/IpSet.pm
+++ b/lib/Vyatta/IpTables/IpSet.pm
@@ -55,6 +55,15 @@ my $logger = 'logger -t IpSet.pm -p local0.warn --';
my $addr_range_mask = 24;
my $lockfile = "/opt/vyatta/config/.lock";
+# remove lock file to avoid commit blockade on interrupt
+# like CTRL+C.
+sub INT_handler {
+ my $rc = system("sudo rm -f $lockfile >>/dev/null");
+ exit(0);
+}
+
+$SIG{'INT'} = 'INT_handler';
+
sub new {
my ($that, $name, $type) = @_;