|
 |
0d20ef |
From 85e7fcbe46ab46bafb1124cf449ec2173e2aeb51 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 |
---
|
|
|
0d20ef |
appliance/init | 13 ++++++-------
|
|
|
0d20ef |
appliance/packagelist.in | 6 ------
|
|
|
0d20ef |
2 files changed, 6 insertions(+), 13 deletions(-)
|
|
|
0d20ef |
|
|
|
0d20ef |
diff --git a/appliance/init b/appliance/init
|
|
|
0d20ef |
index f719a72..6d62338 100755
|
|
|
0d20ef |
--- a/appliance/init
|
|
|
0d20ef |
+++ b/appliance/init
|
|
|
0d20ef |
@@ -79,13 +79,12 @@ hwclock -u -s
|
|
|
0d20ef |
ip addr add 127.0.0.1/8 brd + dev lo scope host
|
|
|
0d20ef |
ip link set dev lo up
|
|
|
0d20ef |
|
|
|
0d20ef |
-if grep -sq guestfs_network=1 /proc/cmdline; then
|
|
|
0d20ef |
- if dhclient --version >/dev/null 2>&1; then
|
|
|
0d20ef |
- dhclient
|
|
|
0d20ef |
- else
|
|
|
0d20ef |
- dhcpcd
|
|
|
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 |
|
|
|
0d20ef |
# Scan for MDs.
|
|
|
0d20ef |
mdadm -As --auto=yes --run
|
|
|
0d20ef |
diff --git a/appliance/packagelist.in b/appliance/packagelist.in
|
|
|
0d20ef |
index 9032d7d..8fb6eca 100644
|
|
|
0d20ef |
--- a/appliance/packagelist.in
|
|
|
0d20ef |
+++ b/appliance/packagelist.in
|
|
|
0d20ef |
@@ -27,7 +27,6 @@ ifelse(REDHAT,1,
|
|
|
0d20ef |
btrfs-progs
|
|
|
0d20ef |
cryptsetup
|
|
|
0d20ef |
cryptsetup-luks dnl old name used before Fedora 17
|
|
|
0d20ef |
- dhclient
|
|
|
0d20ef |
dnl e4fsprogs only exists on RHEL 5, will be ignored everywhere else.
|
|
|
0d20ef |
e4fsprogs
|
|
|
0d20ef |
genisoimage
|
|
|
0d20ef |
@@ -74,7 +73,6 @@ dnl iproute has been renamed to iproute2
|
|
|
0d20ef |
iputils-ping
|
|
|
0d20ef |
iputils-arping
|
|
|
0d20ef |
iputils-tracepath
|
|
|
0d20ef |
- isc-dhcp-client
|
|
|
0d20ef |
libaugeas0
|
|
|
0d20ef |
libc-bin
|
|
|
0d20ef |
libcap2
|
|
|
0d20ef |
@@ -104,7 +102,6 @@ ifelse(ARCHLINUX,1,
|
|
|
0d20ef |
btrfs-progs
|
|
|
0d20ef |
cdrkit
|
|
|
0d20ef |
cryptsetup
|
|
|
0d20ef |
- dhclient
|
|
|
0d20ef |
grub
|
|
|
0d20ef |
hivex
|
|
|
0d20ef |
iproute2
|
|
|
0d20ef |
@@ -133,7 +130,6 @@ ifelse(SUSE,1,
|
|
|
0d20ef |
augeas-lenses
|
|
|
0d20ef |
btrfsprogs
|
|
|
0d20ef |
cryptsetup
|
|
|
0d20ef |
- dhcpcd
|
|
|
0d20ef |
genisoimage
|
|
|
0d20ef |
glibc-locale
|
|
|
0d20ef |
gptfdisk
|
|
|
0d20ef |
@@ -154,7 +150,6 @@ ifelse(FRUGALWARE,1,
|
|
|
0d20ef |
btrfs-progs
|
|
|
0d20ef |
cryptsetup-luks
|
|
|
0d20ef |
cdrkit
|
|
|
0d20ef |
- dhclient
|
|
|
0d20ef |
grub2
|
|
|
0d20ef |
hfsplus
|
|
|
0d20ef |
iproute2
|
|
|
0d20ef |
@@ -182,7 +177,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 |
--
|
|
|
0d20ef |
1.8.3.1
|
|
|
0d20ef |
|