1 |
commit: 717330c071c4f7efaca562c30f6de4dc2f085439 |
2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 25 17:39:43 2013 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 25 17:39:43 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=717330c0 |
7 |
|
8 |
livecd-functions.sh: do not hard code the path to ifconfig |
9 |
|
10 |
Reported-by: fdbugs <AT> dupoux.com |
11 |
X-Gentoo-Bug: 454728 |
12 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=454728 |
13 |
|
14 |
--- |
15 |
livecd-functions.sh | 4 ++-- |
16 |
1 files changed, 2 insertions(+), 2 deletions(-) |
17 |
|
18 |
diff --git a/livecd-functions.sh b/livecd-functions.sh |
19 |
index 81e2f1a..b1a73cb 100755 |
20 |
--- a/livecd-functions.sh |
21 |
+++ b/livecd-functions.sh |
22 |
@@ -242,7 +242,7 @@ livecd_config_ip() { |
23 |
GATEWAY=$(tail -n 1 ${iface}.GW) |
24 |
dialog --visit-items --title "DNS server" --inputbox "Please enter a name server to use (hit enter for none:)" 20 50 2> ${iface}.DNS |
25 |
DNS=$(tail -n 1 ${iface}.DNS) |
26 |
- /sbin/ifconfig ${iface} ${IP} broadcast ${BROADCAST} netmask ${NETMASK} |
27 |
+ ifconfig ${iface} ${IP} broadcast ${BROADCAST} netmask ${NETMASK} |
28 |
if [ -n "${GATEWAY}" ] |
29 |
then |
30 |
/sbin/route add default gw ${GATEWAY} dev ${iface} netmask 0.0.0.0 metric 1 |
31 |
@@ -386,7 +386,7 @@ show_ifmenu() { |
32 |
local opts |
33 |
IFS=" |
34 |
" |
35 |
- for ifname in $(/sbin/ifconfig -a | grep "^[^ ]"); do |
36 |
+ for ifname in $(ifconfig -a | grep "^[^ ]"); do |
37 |
ifname="${ifname%% *}" |
38 |
[[ ${ifname} == "lo" ]] && continue |
39 |
opts="${opts} ${ifname} '$(get_ifdesc ${ifname})'" |