summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2017-09-19 19:23:52 +0200
committer Eric Hameleers <alien@slackware.com>2017-09-19 19:23:52 +0200
commit6abd269ecdf654da088edfea52084d3d6bd9b199 (patch)
treec14258659b2cc640467587669a906e1f80bb86f2
parent88b45c07c3fa1d16d6752f1e5dd78b39f4015af7 (diff)
downloadliveslak-6abd269ecdf654da088edfea52084d3d6bd9b199.tar.gz
liveslak-6abd269ecdf654da088edfea52084d3d6bd9b199.tar.xz
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.
-rwxr-xr-xmake_slackware_live.sh12
1 files 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)