Index: Shorewall-perl/Shorewall/Providers.pm
===================================================================
--- Shorewall-perl/Shorewall/Providers.pm	(revision 6933)
+++ Shorewall-perl/Shorewall/Providers.pm	(working copy)
@@ -375,7 +375,7 @@
 		    '#',
 		    '# Capture the default route(s) if we don\'t have it (them) already.',
 		    '#',
-		    '[ -f ${VARDIR}/default_route ] || ip route ls | grep -E \'^\s*(default |nexthop )\' > ${VARDIR}/default_route',
+		    '[ -f ${VARDIR}/default_route ] || ip route list | grep -E \'^\s*(default |nexthop )\' > ${VARDIR}/default_route',
 		    '#',
 		    '# Initialize the file that holds \'undo\' commands',
 		    '#',
Index: Shorewall-perl/prog.header
===================================================================
--- Shorewall-perl/prog.header	(revision 6933)
+++ Shorewall-perl/prog.header	(working copy)
@@ -426,7 +426,7 @@
 #
 
 find_rt_interface() {
-    ip route ls | while read addr rest; do
+    ip route list | while read addr rest; do
 	case $addr in
 	    */*)
 		in_network ${1%/*} $addr && echo $(find_device $rest)
@@ -447,14 +447,14 @@
 
 find_nexthop() # $1 = interface
 {
-    echo $(find_gateway `ip route ls | grep "[[:space:]]nexthop.* $1"`)
+    echo $(find_gateway `ip route list | grep "[[:space:]]nexthop.* $1"`)
 }
 
 #
 # Find the default route's interface
 #
 find_default_interface() {
-    ip route ls | while read first rest; do
+    ip route list | while read first rest; do
 	[ "$first" = default ] && echo $(find_device $rest) && return
     done
 }
@@ -480,7 +480,7 @@
 find_interface_by_mac() {
     local mac=$1 first second rest dev
 
-    ip link ls | while read first second rest; do
+    ip link list | while read first second rest; do
 	case $first in
 	    *:)
                 dev=$second
@@ -498,7 +498,7 @@
 # Determine if Interface is up
 #
 interface_is_up() {
-    [ -n "$(ip link ls dev $1 2> /dev/null | grep -e '[<,]UP[,>]')" ]
+    [ -n "$(ip link list dev $1 2> /dev/null | grep -e '[<,]UP[,>]')" ]
 }
 
 #
@@ -709,11 +709,11 @@
     #
     # First assume that this is some sort of point-to-point interface
     #
-    gateway=$( find_peer $(ip addr ls $interface ) )
+    gateway=$( find_peer $(ip addr list $interface ) )
     #
     # Maybe there's a default route through this gateway already
     #
-    [ -n "$gateway" ] || gateway=$(find_gateway $(ip route ls dev $interface))
+    [ -n "$gateway" ] || gateway=$(find_gateway $(ip route list dev $interface))
     #
     # Last hope -- is there a load-balancing route through the interface?
     #
@@ -728,7 +728,7 @@
 # Disable IPV6
 #
 disable_ipv6() {
-    local foo="$(ip -f inet6 addr ls 2> /dev/null)"
+    local foo="$(ip -f inet6 addr list 2> /dev/null)"
 
     if [ -n "$foo" ]; then
 	if qt mywhich ip6tables; then
@@ -782,7 +782,7 @@
 #
 get_device_mtu() # $1 = device
 {
-    local output="$(ip link ls dev $1 2> /dev/null)" # quotes required for /bin/ash
+    local output="$(ip link list dev $1 2> /dev/null)" # quotes required for /bin/ash
 
     if [ -n "$output" ]; then
 	echo $(find_mtu $output)
@@ -797,7 +797,7 @@
 #
 get_device_mtu1() # $1 = device
 {
-    local output="$(ip link ls dev $1 2> /dev/null)" # quotes required for /bin/ash
+    local output="$(ip link list dev $1 2> /dev/null)" # quotes required for /bin/ash
     local mtu
 
     if [ -n "$output" ]; then
Index: Shorewall-shell/lib.providers
===================================================================
--- Shorewall-shell/lib.providers	(revision 6933)
+++ Shorewall-shell/lib.providers	(working copy)
@@ -339,7 +339,7 @@
 #
 # Capture the default route(s) if we don't have it (them) already.
 #
-[ -f \${VARDIR}/default_route ] || ip route ls | grep -E '^\s*(default |nexthop )' > \${VARDIR}/default_route
+[ -f \${VARDIR}/default_route ] || ip route list | grep -E '^\s*(default |nexthop )' > \${VARDIR}/default_route
 #
 # Initialize the file that holds 'undo' commands
 #
Index: Shorewall-common/lib.cli
===================================================================
--- Shorewall-common/lib.cli	(revision 6933)
+++ Shorewall-common/lib.cli	(working copy)
@@ -363,18 +363,18 @@
 # Show routing configuration
 #
 show_routing() {
-    if [ -n "$(ip rule ls)" ]; then
+    if [ -n "$(ip rule list)" ]; then
 	heading "Routing Rules"
-	ip rule ls
-	ip rule ls | while read rule; do
+	ip rule list
+	ip rule list | while read rule; do
 	    echo ${rule##* }
 	done | sort -u | while read table; do
 	    heading "Table $table:"
-	    ip route ls table $table
+	    ip route list table $table
 	done
     else
 	heading "Routing Table"
-	ip route ls
+	ip route list
     fi
 }
 
@@ -530,7 +530,7 @@
 	    [ $# -gt 1 ] && usage 1
 	    echo "$PRODUCT $version IP at $HOSTNAME - $(date)"
 	    echo
-	    ip addr ls
+	    ip addr list
 	    ;;
 	routing)
 	    [ $# -gt 1 ] && usage 1
@@ -697,10 +697,10 @@
     [ -f /proc/net/ip_conntrack ] && cat /proc/net/ip_conntrack || cat /proc/net/nf_conntrack
 
     heading "IP Configuration"
-    ip addr ls
+    ip addr list
 
     heading "IP Stats"
-    ip -stat link ls
+    ip -stat link list
 
     if qt mywhich brctl; then
 	heading "Bridges"
Index: Shorewall-common/lib.base
===================================================================
--- Shorewall-common/lib.base	(revision 6933)
+++ Shorewall-common/lib.base	(working copy)
@@ -700,7 +700,7 @@
 #
 
 find_rt_interface() {
-    ip route ls | while read addr rest; do
+    ip route list | while read addr rest; do
 	case $addr in
 	    */*)
 		in_network ${1%/*} $addr && echo $(find_device $rest)
@@ -721,14 +721,14 @@
 
 find_nexthop() # $1 = interface
 {
-    echo $(find_gateway `ip route ls | grep "[[:space:]]nexthop.* $1"`)
+    echo $(find_gateway `ip route list | grep "[[:space:]]nexthop.* $1"`)
 }
 
 #
 # Find the default route's interface
 #
 find_default_interface() {
-    ip route ls | while read first rest; do
+    ip route list | while read first rest; do
 	[ "$first" = default ] && echo $(find_device $rest) && return
     done
 }
@@ -754,7 +754,7 @@
 find_interface_by_mac() {
     local mac=$1 first second rest dev
 
-    ip link ls | while read first second rest; do
+    ip link list | while read first second rest; do
 	case $first in
 	    *:)
                 dev=$second
@@ -772,7 +772,7 @@
 # Determine if Interface is up
 #
 interface_is_up() {
-    [ -n "$(ip link ls dev $1 2> /dev/null | grep -e '[<,]UP[,>]')" ]
+    [ -n "$(ip link list dev $1 2> /dev/null | grep -e '[<,]UP[,>]')" ]
 }
 
 #
@@ -1240,11 +1240,11 @@
     #
     # First assume that this is some sort of point-to-point interface
     #
-    gateway=$( find_peer $(ip addr ls $interface ) )
+    gateway=$( find_peer $(ip addr list $interface ) )
     #
     # Maybe there's a default route through this gateway already
     #
-    [ -n "$gateway" ] || gateway=$(find_gateway $(ip route ls dev $interface))
+    [ -n "$gateway" ] || gateway=$(find_gateway $(ip route list dev $interface))
     #
     # Last hope -- is there a load-balancing route through the interface?
     #
@@ -1259,7 +1259,7 @@
 # Disable IPV6
 #
 disable_ipv6() {
-    local foo="$(ip -f inet6 addr ls 2> /dev/null)"
+    local foo="$(ip -f inet6 addr list 2> /dev/null)"
 
     if [ -n "$foo" ]; then
 	if qt mywhich ip6tables; then
@@ -1389,7 +1389,7 @@
 #
 get_device_mtu() # $1 = device
 {
-    local output="$(ip link ls dev $1 2> /dev/null)" # quotes required for /bin/ash
+    local output="$(ip link list dev $1 2> /dev/null)" # quotes required for /bin/ash
 
     if [ -n "$output" ]; then
 	echo $(find_mtu $output)
@@ -1404,7 +1404,7 @@
 #
 get_device_mtu1() # $1 = device
 {
-    local output="$(ip link ls dev $1 2> /dev/null)" # quotes required for /bin/ash
+    local output="$(ip link list dev $1 2> /dev/null)" # quotes required for /bin/ash
     local mtu
 
     if [ -n "$output" ]; then