summaryrefslogtreecommitdiffstats
path: root/appliance
diff options
context:
space:
mode:
authorJiri Popelka <jpopelka@redhat.com>2012-01-25 17:16:56 +0000
committerRichard W.M. Jones <rjones@redhat.com>2012-01-25 19:15:41 +0000
commit501561742b43edb044072ec85048bb35b0b8201a (patch)
tree1122b76ae955ffad04779e24d738c772367e07cd /appliance
parent8ac53919357eae4b4f891bf2f6cb8635dd905fe3 (diff)
downloadlibguestfs-501561742b43edb044072ec85048bb35b0b8201a.tar.gz
libguestfs-501561742b43edb044072ec85048bb35b0b8201a.tar.xz
libguestfs-501561742b43edb044072ec85048bb35b0b8201a.zip
appliance: Switch to using 'iproute' ('ip' command) from 'net-tools' (RHBZ#784647).
Change 'ifconfig' and 'netstat' commands to use 'ip' instead. 'iproute' was already included in the appliance, so this reduces the size of the appliance accordingly.
Diffstat (limited to 'appliance')
-rwxr-xr-xappliance/init14
-rw-r--r--appliance/packagelist.in2
2 files changed, 10 insertions, 6 deletions
diff --git a/appliance/init b/appliance/init
index 1d69339b..d3a61562 100755
--- a/appliance/init
+++ b/appliance/init
@@ -66,9 +66,13 @@ fi
hwclock -u -s
# Set up the network.
-ifconfig lo 127.0.0.1
-ifconfig eth0 169.254.2.10
-route add default gw 169.254.2.2
+ip addr add 127.0.0.1/8 brd + dev lo scope host
+ip link set dev lo up
+
+ip addr add 169.254.2.10/16 brd + dev eth0 scope global
+ip link set dev eth0 up
+
+ip route add default via 169.254.2.2
# Scan for MDs.
mdadm -As --auto=yes --run
@@ -94,8 +98,8 @@ if grep -sq guestfs_verbose=1 /proc/cmdline; then
lvm pvs
lvm vgs
lvm lvs
- ifconfig
- netstat -rn
+ ip a
+ ip r
lsmod
#hwclock -r
date
diff --git a/appliance/packagelist.in b/appliance/packagelist.in
index b42c5107..2ab6b804 100644
--- a/appliance/packagelist.in
+++ b/appliance/packagelist.in
@@ -104,6 +104,7 @@ findutils
gawk
grep
gzip
+iproute
jfsutils
libxml2
lsof
@@ -111,7 +112,6 @@ lvm2
lzop
mdadm
module-init-tools
-net-tools
/*
Enabling this pulls out 140 extra packages
into the appliance: