|
 |
97ae69 |
From 88ccab22e0af7ffe4c2ffa9a01e39e5f6f693722 Mon Sep 17 00:00:00 2001
|
|
|
0d20ef |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
0d20ef |
Date: Fri, 10 Oct 2014 17:46:02 +0100
|
|
|
0d20ef |
Subject: [PATCH] RHEL 7: Revert "appliance: Use dhclient or dhcpcd instead of
|
|
|
0d20ef |
hard-coding IP address of appliance."
|
|
|
0d20ef |
|
|
|
0d20ef |
This reverts commit 67e6f32a240c7c234e6af637c1cd324b36a82cd3.
|
|
|
0d20ef |
---
|
|
|
e76f14 |
appliance/init | 15 ++++++---------
|
|
|
e76f14 |
appliance/packagelist.in | 7 -------
|
|
|
e76f14 |
2 files changed, 6 insertions(+), 16 deletions(-)
|
|
|
0d20ef |
|
|
|
0d20ef |
diff --git a/appliance/init b/appliance/init
|
|
|
97ae69 |
index f530ad3d5..1cd264e08 100755
|
|
|
0d20ef |
--- a/appliance/init
|
|
|
0d20ef |
+++ b/appliance/init
|
|
|
a30de4 |
@@ -120,15 +120,12 @@ shopt -u nullglob
|
|
|
0d20ef |
ip addr add 127.0.0.1/8 brd + dev lo scope host
|
|
|
0d20ef |
ip link set dev lo up
|
|
|
0d20ef |
|
|
|
e76f14 |
-if test "$guestfs_network" = 1; then
|
|
|
e76f14 |
- iface=$(ls -I all -I default -I lo /proc/sys/net/ipv4/conf)
|
|
|
e76f14 |
- touch /etc/fstab # Workaround for Ubuntu.
|
|
|
0d20ef |
- if dhclient --version >/dev/null 2>&1; then
|
|
|
e76f14 |
- dhclient $iface
|
|
|
0d20ef |
- else
|
|
|
e76f14 |
- dhcpcd $iface
|
|
|
0d20ef |
- fi
|
|
|
0d20ef |
-fi
|
|
|
0d20ef |
+ip addr add 169.254.2.10/16 brd + dev eth0 scope global
|
|
|
0d20ef |
+ip link set dev eth0 up
|
|
|
0d20ef |
+
|
|
|
0d20ef |
+ip route add default via 169.254.2.2
|
|
|
0d20ef |
+
|
|
|
0d20ef |
+echo nameserver 169.254.2.3 > /etc/resolv.conf
|
|
|
0d20ef |
|
|
|
97ae69 |
# Scan for MDs but don't run arrays unless all expected drives are present
|
|
|
97ae69 |
mdadm -As --auto=yes --no-degraded
|
|
|
0d20ef |
diff --git a/appliance/packagelist.in b/appliance/packagelist.in
|
|
|
97ae69 |
index 81a8f0dba..1e7d53481 100644
|
|
|
0d20ef |
--- a/appliance/packagelist.in
|
|
|
0d20ef |
+++ b/appliance/packagelist.in
|
|
|
e76f14 |
@@ -26,7 +26,6 @@ ifelse(REDHAT,1,
|
|
|
e76f14 |
augeas-libs
|
|
|
0d20ef |
cryptsetup
|
|
|
0d20ef |
cryptsetup-luks dnl old name used before Fedora 17
|
|
|
0d20ef |
- dhclient
|
|
|
0d20ef |
genisoimage
|
|
|
e76f14 |
gfs-utils
|
|
|
e76f14 |
gfs2-utils
|
|
|
97ae69 |
@@ -76,7 +75,6 @@ dnl iproute has been renamed to iproute2
|
|
|
0d20ef |
iputils-ping
|
|
|
0d20ef |
iputils-arping
|
|
|
0d20ef |
iputils-tracepath
|
|
|
0d20ef |
- isc-dhcp-client
|
|
|
90a56e |
ldmtool
|
|
|
0d20ef |
libaugeas0
|
|
|
0d20ef |
libc-bin
|
|
|
97ae69 |
@@ -110,7 +108,6 @@ ifelse(ARCHLINUX,1,
|
|
|
0d20ef |
cdrkit
|
|
|
90a56e |
cdrtools
|
|
|
0d20ef |
cryptsetup
|
|
|
0d20ef |
- dhclient
|
|
|
0d20ef |
grub
|
|
|
0d20ef |
hivex
|
|
|
0d20ef |
iproute2
|
|
|
97ae69 |
@@ -141,8 +138,6 @@ ifelse(SUSE,1,
|
|
|
0d20ef |
btrfsprogs
|
|
|
a30de4 |
cdrkit-cdrtools-compat
|
|
|
0d20ef |
cryptsetup
|
|
|
0d20ef |
- dhcpcd
|
|
|
e76f14 |
- dhcp-client
|
|
|
0d20ef |
genisoimage
|
|
|
0d20ef |
glibc-locale
|
|
|
0d20ef |
gptfdisk
|
|
|
97ae69 |
@@ -171,7 +166,6 @@ ifelse(FRUGALWARE,1,
|
|
|
e76f14 |
augeas
|
|
|
0d20ef |
cryptsetup-luks
|
|
|
0d20ef |
cdrkit
|
|
|
0d20ef |
- dhclient
|
|
|
0d20ef |
grub2
|
|
|
0d20ef |
hfsplus
|
|
|
0d20ef |
iproute2
|
|
|
97ae69 |
@@ -199,7 +193,6 @@ ifelse(MAGEIA,1,
|
|
|
0d20ef |
chkconfig /* for /etc/init.d */
|
|
|
0d20ef |
cdrkit-genisoimage
|
|
|
0d20ef |
cdrkit-isotools
|
|
|
0d20ef |
- dhclient
|
|
|
0d20ef |
extlinux
|
|
|
0d20ef |
gfs2-utils
|
|
|
0d20ef |
grub
|
|
|
0d20ef |
--
|
|
|
97ae69 |
2.17.1
|
|
|
0d20ef |
|