diff --git a/debian/changelog b/debian/changelog index fc029c37..23deccd1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,11 @@ byobu (5.127) unreleased; urgency=medium - deprecate unmaintained ec2/rcs pricing functionality - this never really worked well, and these prices are constantly changing - clear out stale status cache + * debian/control, usr/lib/byobu/ip_address, usr/lib/byobu/network, + usr/share/man/man1/wifi-status.1: LP: #1748956 + - switch entirely to iproute2, away from net-tools and ifconfig + - only remaining ifconfig is fall-back logic, in case /sbin/ip is + not found -- Dustin Kirkland Sun, 27 May 2018 18:07:11 -0500 diff --git a/debian/control b/debian/control index 90aa3f3b..d73e5f2e 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Depends: ${misc:Depends}, ${perl:Depends}, ${python3:Depends}, debconf (>= 0.5) | debconf-2.0, gettext-base, - net-tools, + iproute2, python3, python3-newt, tmux (>= 1.5), diff --git a/usr/lib/byobu/ip_address b/usr/lib/byobu/ip_address index 70170a09..76530d5d 100755 --- a/usr/lib/byobu/ip_address +++ b/usr/lib/byobu/ip_address @@ -20,7 +20,6 @@ # along with this program. If not, see . __ip_address_detail() { - [ -x /sbin/ifconfig ] && /sbin/ifconfig if [ -x /sbin/ip ]; then /sbin/ip -4 addr list /sbin/ip -6 addr list diff --git a/usr/lib/byobu/network b/usr/lib/byobu/network index 58f1fc93..833b763c 100755 --- a/usr/lib/byobu/network +++ b/usr/lib/byobu/network @@ -21,7 +21,7 @@ __network_detail() { get_network_interface; local interface="$_RET" - LC_ALL=C /sbin/ifconfig "$interface" | $BYOBU_SED 's/\s*$//' + LC_ALL=C /sbin/ip addr show "$interface" | $BYOBU_SED 's/\s*$//' } __network() { diff --git a/usr/share/man/man1/wifi-status.1 b/usr/share/man/man1/wifi-status.1 index b52688c2..06a77618 100644 --- a/usr/share/man/man1/wifi-status.1 +++ b/usr/share/man/man1/wifi-status.1 @@ -10,31 +10,8 @@ wifi-status \- monitor the wireless interface This is often useful when trying to associate with an access point. -.SH EXAMPLE - $ wifi-status - -Every 1.0s: iwconfig wlan0; ifconfig wlan0 - -wlan0 IEEE 802.11abgn ESSID:"default" - Mode:Managed Frequency:2.462 GHz Access Point: 00:11:22:33:44:55 - Bit Rate=81 Mb/s Tx-Power=15 dBm - Retry long limit:7 RTS thr:off Fragment thr:off - Power Management:on - Link Quality=70/70 Signal level=-35 dBm - Rx invalid nwid:0 Rx invalid crypt:0 Rx invalid frag:0 - Tx excessive retries:0 Invalid misc:0 Missed beacon:0 - -wlan0 Link encap:Ethernet HWaddr 00:11:22:33:44:55 - inet addr:10.10.10.103 Bcast:10.9.8.255 Mask:255.255.255.0 - inet6 addr: aaaa::bbb:cccc:dddd:eeee/64 Scope:Link - UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 - RX packets:10582 errors:0 dropped:0 overruns:0 frame:0 - TX packets:6383 errors:0 dropped:0 overruns:0 carrier:0 - collisions:0 txqueuelen:1000 - RX bytes:8243607 (8.2 MB) TX bytes:1077323 (1.0 MB) - .SH SEE ALSO -\fBiwconfig\fP(8)\fP, \fBifconfig\fP(8) +\fBiwconfig\fP(8)\fP, \fBip\fP(8) .SH AUTHOR This manpage and the utility was written by Dustin Kirkland for Ubuntu systems (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 published by the Free Software Foundation.