From 6abd269ecdf654da088edfea52084d3d6bd9b199 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Tue, 19 Sep 2017 19:23:52 +0200
Subject: Add dhcpcd to the initrd always

Dhcpcd is for NFS root support.
Adding it outside of the network kernel module loop allows us
to update the kernel modules separately and more easily.
---
 make_slackware_live.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index a300e6c..c10ec51 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -2088,13 +2088,13 @@ cat $LIVE_TOOLDIR/liveinit.tpl | sed \
 cat /dev/null > ${LIVE_ROOTDIR}/boot/initrd-tree/luksdev
 # We do not add openobex to the initrd and don't want to see irrelevant errors:
 rm ${LIVE_ROOTDIR}/boot/initrd-tree/lib/udev/rules.d/*openobex*rules 2>${DBGOUT} || true
+# Add dhcpcd for NFS root support (just to have it - even if we won't need it):
+DHCPD_PKG=$(find ${DEF_SL_PKGROOT}/../ -name "dhcpcd-*.t?z" |head -1)
+tar -C ${LIVE_ROOTDIR}/boot/initrd-tree/ -xf ${DHCPD_PKG} \
+  var/lib/dhcpcd lib/dhcpcd sbin/dhcpcd usr/lib${DIRSUFFIX}/dhcpcd \
+  etc/dhcpcd.conf.new
+mv ${LIVE_ROOTDIR}/boot/initrd-tree/etc/dhcpcd.conf{.new,}
 if [ "$NFSROOTSUP" = "YES" ]; then
-  # Add dhcpcd for NFS root support:
-  DHCPD_PKG=$(find ${DEF_SL_PKGROOT}/../ -name "dhcpcd-*.t?z" |head -1)
-  tar -C ${LIVE_ROOTDIR}/boot/initrd-tree/ -xf ${DHCPD_PKG} \
-    var/lib/dhcpcd lib/dhcpcd sbin/dhcpcd usr/lib${DIRSUFFIX}/dhcpcd \
-    etc/dhcpcd.conf.new
-  mv ${LIVE_ROOTDIR}/boot/initrd-tree/etc/dhcpcd.conf{.new,}
   # Add just the right kernel network modules by pruning unneeded stuff:
   if [ "$SL_ARCH" = "x86_64" -o "$SMP32" = "NO" ]; then
     KMODS_PKG=$(find ${DEF_SL_PKGROOT}/../ -name "kernel-modules-*$(echo $KGEN |tr - _)*.t?z" |grep -v smp |head -1)
-- 
cgit v1.2.3