[PATCH 1/2] Put dhcp configuration files in /etc/dhcp (#607741)

[David Cantrell <dcantrell@xxxxxxxxxx>]

The location for dhclient configuration files is /etc/dhcp rather than
just /etc.
---
 network.py  |    4 ++--
 packages.py |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/network.py b/network.py
index f7c5a3b..d7793f2 100644
--- a/network.py
+++ b/network.py
@@ -540,11 +540,11 @@ class Network:
             return
 
         # /etc/sysconfig/network-scripts/ifcfg-DEVICE
-        # /etc/dhclient-DEVICE.conf
+        # /etc/dhcp/dhclient-DEVICE.conf
         # TODORV: do we really don't want overwrite on live cd?
         for devName, device in self.netdevices.items():
             self._copyFileToPath(device.path, instPath)
-            dhclientfile = os.path.join("/etc/dhclient-%s.conf" % devName)
+            dhclientfile = os.path.join("/etc/dhcp/dhclient-%s.conf" % devName)
             self._copyFileToPath(dhclientfile, instPath)
 
         # /etc/sysconfig/network
diff --git a/packages.py b/packages.py
index 653e8de..e0546ca 100644
--- a/packages.py
+++ b/packages.py
@@ -231,7 +231,7 @@ def setFileCons(anaconda):
                  "/etc/udev/rules.d/70-persistent-net.rules",
                  "/root/install.log", "/root/install.log.syslog",
                  "/etc/shadow", "/etc/shadow-", "/etc/gshadow"] + \
-                glob.glob('/etc/dhclient-*.conf')
+                glob.glob('/etc/dhcp/dhclient-*.conf')
 
         vgs = ["/dev/%s" % vg.name for vg in anaconda.id.storage.vgs]
 
-- 
1.7.0.1

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list