diff options
-rwxr-xr-x | liveinit.tpl | 4 | ||||
-rwxr-xr-x | make_slackware_live.sh | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/liveinit.tpl b/liveinit.tpl index 7bc9808..2d134e1 100755 --- a/liveinit.tpl +++ b/liveinit.tpl @@ -422,7 +422,7 @@ if [ "$RESCUE" = "" ]; then continue # skip wireless interfaces fi # If this configures an interface, we're done with dhcpcd afterwards: - /sbin/dhcpcd -L -p -t $DHCPWAIT $EDEV & + /sbin/dhcpcd -L -p -j /var/log/dhcpcd.log -t $DHCPWAIT $EDEV & done unset EDEV # Wait at most DHCPWAIT seconds for a DHCP-configured interface to appear: @@ -455,7 +455,7 @@ if [ "$RESCUE" = "" ]; then if [ "$ENET_MODE" = "ask" -o "$ENET_MODE" = "dhcp" ]; then # Invoke dhcpcd only if it was not called yet: if [ ! -s $(get_dhcpcd_pid $INTERFACE) ]; then - /sbin/dhcpcd -L -p -t $DHCPWAIT $INTERFACE + /sbin/dhcpcd -L -p -j /var/log/dhcpcd.log -t $DHCPWAIT $INTERFACE fi else # Kill dhcpcd if we used it to find a statically configured interface: diff --git a/make_slackware_live.sh b/make_slackware_live.sh index 1b7eb19..2f91d89 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -2351,6 +2351,10 @@ 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,} +# Stamp the Slackware version into the initrd (at least dhcpcd needs this): +mkdir -p ${LIVE_ROOTDIR}/boot/initrd-tree/etc/rc.d +cp -a ${LIVE_ROOTDIR}/etc/slackware-version ${LIVE_ROOTDIR}/etc/os-release \ + ${LIVE_ROOTDIR}/boot/initrd-tree/etc/ if [ "$NFSROOTSUP" = "YES" ]; then # Add just the right kernel network modules by pruning unneeded stuff: if [ "$SL_ARCH" = "x86_64" -o "$SMP32" = "NO" ]; then |