diff options
| -rwxr-xr-x | liveinit | 2 | ||||
| -rwxr-xr-x | make_slackware_live.sh | 20 |
2 files changed, 18 insertions, 4 deletions
@@ -740,7 +740,7 @@ if [ "$RESCUE" = "" ]; then # Make the underpinning RAM fs accessible in the live system (for fun): mkdir -p /mnt/overlay/mnt/live - mount --bind /mnt/live /mnt/overlay/mnt/live + mount --rbind /mnt/live /mnt/overlay/mnt/live mkdir -p /mnt/overlay/mnt/${LIVEMAIN}fs mount --bind /mnt/${LIVEMAIN}fs /mnt/overlay/mnt/${LIVEMAIN}fs diff --git a/make_slackware_live.sh b/make_slackware_live.sh index 5a82823..e436b96 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -1579,13 +1579,27 @@ sed -e "s% /sbin/depmod -%#&%" -i ${LIVE_ROOTDIR}/etc/rc.d/rc.modules # If we detect a NVIDIA driver, then run the nvidia install routine: cat <<EOT >> ${LIVE_ROOTDIR}/etc/rc.d/rc.local +# Find out if the user enabled any optional/addon kernel modules: +RUN_DEPMOD=0 +for MOD in \$(losetup -l |grep -E "optional|addons" |tr -s ' ' |cut -d' ' -f6) +do + if [ -d /mnt/live/modules/\$(basename \$MOD .sxz)/lib/modules/\$(uname -r)/ ] + then + # Found kernel modules directory; we need to make a 'depmod' call. + RUN_DEPMOD=1 + fi +done +if [ \$RUN_DEPMOD -eq 1 ]; then + # This costs a few seconds in additional boot-up time unfortunately: + echo "A bit of patience while we register your new kernel module(s)..." + /sbin/depmod -a +fi +unset RUN_DEPMOD + # Deal with the presence of NVIDIA drivers: if [ -x /usr/sbin/nvidia-switch ]; then if [ -f /usr/lib${DIRSUFFIX}/xorg/modules/extensions/libglx.so.*-nvidia -a -f /usr/lib${DIRSUFFIX}/xorg/modules/drivers/nvidia_drv.so ]; then echo "-- Installing binary Nvidia drivers: /usr/sbin/nvidia-switch --install" - # The nvidia kernel module needs to ne announced to the kernel. - # This costs a few seconds in additional boot-up time unfortunately: - /sbin/depmod -a /usr/sbin/nvidia-switch --install fi # For CUDA/OpenCL to work after reboot, create missing nvidia device nodes: |