diff options
| author | Ben Hutchings <ben.hutchings@codethink.co.uk> | 2015-02-23 21:33:08 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-23 22:04:21 -0500 |
| commit | 16b5d0c4a24c793ca3584ca5c50fd5f8f2166120 (patch) | |
| tree | 9da3c9b262e675dc8be5afd0e5e7f877363ead81 /samples/pktgen | |
| parent | db72aba30a4f4c15eb20066f1d9c1bcbcf419236 (diff) | |
samples/pktgen: Trap SIGINT
Otherwise ^C stops the script, not just pktgen.
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'samples/pktgen')
| -rwxr-xr-x | samples/pktgen/pktgen.conf-1-1 | 1 | ||||
| -rwxr-xr-x | samples/pktgen/pktgen.conf-1-1-flows | 1 | ||||
| -rwxr-xr-x | samples/pktgen/pktgen.conf-1-1-ip6 | 1 | ||||
| -rwxr-xr-x | samples/pktgen/pktgen.conf-1-1-ip6-rdos | 1 | ||||
| -rwxr-xr-x | samples/pktgen/pktgen.conf-1-1-rdos | 1 | ||||
| -rwxr-xr-x | samples/pktgen/pktgen.conf-1-2 | 1 | ||||
| -rwxr-xr-x | samples/pktgen/pktgen.conf-2-1 | 1 | ||||
| -rwxr-xr-x | samples/pktgen/pktgen.conf-2-2 | 1 |
8 files changed, 8 insertions, 0 deletions
diff --git a/samples/pktgen/pktgen.conf-1-1 b/samples/pktgen/pktgen.conf-1-1 index bb5398367d4b..fc1d15c98595 100755 --- a/samples/pktgen/pktgen.conf-1-1 +++ b/samples/pktgen/pktgen.conf-1-1 | |||
| @@ -53,6 +53,7 @@ PGDEV=/proc/net/pktgen/eth1 | |||
| 53 | PGDEV=/proc/net/pktgen/pgctrl | 53 | PGDEV=/proc/net/pktgen/pgctrl |
| 54 | 54 | ||
| 55 | echo "Running... ctrl^C to stop" | 55 | echo "Running... ctrl^C to stop" |
| 56 | trap true INT | ||
| 56 | pgset "start" | 57 | pgset "start" |
| 57 | echo "Done" | 58 | echo "Done" |
| 58 | 59 | ||
diff --git a/samples/pktgen/pktgen.conf-1-1-flows b/samples/pktgen/pktgen.conf-1-1-flows index db20ac8a66a7..e00d66c8f5e5 100755 --- a/samples/pktgen/pktgen.conf-1-1-flows +++ b/samples/pktgen/pktgen.conf-1-1-flows | |||
| @@ -61,6 +61,7 @@ PGDEV=/proc/net/pktgen/eth1 | |||
| 61 | PGDEV=/proc/net/pktgen/pgctrl | 61 | PGDEV=/proc/net/pktgen/pgctrl |
| 62 | 62 | ||
| 63 | echo "Running... ctrl^C to stop" | 63 | echo "Running... ctrl^C to stop" |
| 64 | trap true INT | ||
| 64 | pgset "start" | 65 | pgset "start" |
| 65 | echo "Done" | 66 | echo "Done" |
| 66 | 67 | ||
diff --git a/samples/pktgen/pktgen.conf-1-1-ip6 b/samples/pktgen/pktgen.conf-1-1-ip6 index e22199d1ed76..f16145303afb 100755 --- a/samples/pktgen/pktgen.conf-1-1-ip6 +++ b/samples/pktgen/pktgen.conf-1-1-ip6 | |||
| @@ -54,6 +54,7 @@ PGDEV=/proc/net/pktgen/eth1 | |||
| 54 | PGDEV=/proc/net/pktgen/pgctrl | 54 | PGDEV=/proc/net/pktgen/pgctrl |
| 55 | 55 | ||
| 56 | echo "Running... ctrl^C to stop" | 56 | echo "Running... ctrl^C to stop" |
| 57 | trap true INT | ||
| 57 | pgset "start" | 58 | pgset "start" |
| 58 | echo "Done" | 59 | echo "Done" |
| 59 | 60 | ||
diff --git a/samples/pktgen/pktgen.conf-1-1-ip6-rdos b/samples/pktgen/pktgen.conf-1-1-ip6-rdos index 58dd0524f264..06b502834cc7 100755 --- a/samples/pktgen/pktgen.conf-1-1-ip6-rdos +++ b/samples/pktgen/pktgen.conf-1-1-ip6-rdos | |||
| @@ -57,6 +57,7 @@ PGDEV=/proc/net/pktgen/eth1 | |||
| 57 | PGDEV=/proc/net/pktgen/pgctrl | 57 | PGDEV=/proc/net/pktgen/pgctrl |
| 58 | 58 | ||
| 59 | echo "Running... ctrl^C to stop" | 59 | echo "Running... ctrl^C to stop" |
| 60 | trap true INT | ||
| 60 | pgset "start" | 61 | pgset "start" |
| 61 | echo "Done" | 62 | echo "Done" |
| 62 | 63 | ||
diff --git a/samples/pktgen/pktgen.conf-1-1-rdos b/samples/pktgen/pktgen.conf-1-1-rdos index 2834ac789721..8f1ce1a0aa98 100755 --- a/samples/pktgen/pktgen.conf-1-1-rdos +++ b/samples/pktgen/pktgen.conf-1-1-rdos | |||
| @@ -58,6 +58,7 @@ PGDEV=/proc/net/pktgen/eth1 | |||
| 58 | PGDEV=/proc/net/pktgen/pgctrl | 58 | PGDEV=/proc/net/pktgen/pgctrl |
| 59 | 59 | ||
| 60 | echo "Running... ctrl^C to stop" | 60 | echo "Running... ctrl^C to stop" |
| 61 | trap true INT | ||
| 61 | pgset "start" | 62 | pgset "start" |
| 62 | echo "Done" | 63 | echo "Done" |
| 63 | 64 | ||
diff --git a/samples/pktgen/pktgen.conf-1-2 b/samples/pktgen/pktgen.conf-1-2 index b519dab262ce..f151e85c536a 100755 --- a/samples/pktgen/pktgen.conf-1-2 +++ b/samples/pktgen/pktgen.conf-1-2 | |||
| @@ -63,6 +63,7 @@ PGDEV=/proc/net/pktgen/eth2 | |||
| 63 | PGDEV=/proc/net/pktgen/pgctrl | 63 | PGDEV=/proc/net/pktgen/pgctrl |
| 64 | 64 | ||
| 65 | echo "Running... ctrl^C to stop" | 65 | echo "Running... ctrl^C to stop" |
| 66 | trap true INT | ||
| 66 | pgset "start" | 67 | pgset "start" |
| 67 | echo "Done" | 68 | echo "Done" |
| 68 | 69 | ||
diff --git a/samples/pktgen/pktgen.conf-2-1 b/samples/pktgen/pktgen.conf-2-1 index 6f57a558d817..e6b36b2f840e 100755 --- a/samples/pktgen/pktgen.conf-2-1 +++ b/samples/pktgen/pktgen.conf-2-1 | |||
| @@ -60,6 +60,7 @@ PGDEV=/proc/net/pktgen/eth1 | |||
| 60 | PGDEV=/proc/net/pktgen/pgctrl | 60 | PGDEV=/proc/net/pktgen/pgctrl |
| 61 | 61 | ||
| 62 | echo "Running... ctrl^C to stop" | 62 | echo "Running... ctrl^C to stop" |
| 63 | trap true INT | ||
| 63 | pgset "start" | 64 | pgset "start" |
| 64 | echo "Done" | 65 | echo "Done" |
| 65 | 66 | ||
diff --git a/samples/pktgen/pktgen.conf-2-2 b/samples/pktgen/pktgen.conf-2-2 index aa3225280521..6484435c104e 100755 --- a/samples/pktgen/pktgen.conf-2-2 +++ b/samples/pktgen/pktgen.conf-2-2 | |||
| @@ -67,6 +67,7 @@ PGDEV=/proc/net/pktgen/eth2 | |||
| 67 | PGDEV=/proc/net/pktgen/pgctrl | 67 | PGDEV=/proc/net/pktgen/pgctrl |
| 68 | 68 | ||
| 69 | echo "Running... ctrl^C to stop" | 69 | echo "Running... ctrl^C to stop" |
| 70 | trap true INT | ||
| 70 | pgset "start" | 71 | pgset "start" |
| 71 | echo "Done" | 72 | echo "Done" |
| 72 | 73 | ||
