diff options
| author |   Eric Hameleers <alien@slackware.com> | 2015-12-23 23:47:29 +0100 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2015-12-23 23:47:29 +0100 |
| commit | cbff33ba5652c3f9cbf081b21ff77d8d5f998ce4 (patch) | |
| tree | 345515fcfbd2b0aecc7ec24377ee2bf575c0df8f | |
| parent | 6868577cdf2e60aa58381d596dd24e5bf78bd467 (diff) | |
| download | liveslak-cbff33ba5652c3f9cbf081b21ff77d8d5f998ce4.tar.gz liveslak-cbff33ba5652c3f9cbf081b21ff77d8d5f998ce4.tar.xz | |
This marker is no longer used.
Diffstat (limited to '')
| -rwxr-xr-x | make_slackware_live.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh index 3898f2e..8135861 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -78,6 +78,11 @@ CONSFONT=${CONSFONT:-"ter-i16v.psf"} # Example commandline parameter: "-r l,kde,kdei" REFRESH="" +# The amount of seconds we want the init script to wait to give the kernel's +# USB subsystem time to settle. The default value of mkinitrd is "1" which +# is too short for use with USB sticks but "1" is fine for CDROM/DVD. +WAIT=${WAIT:-"5"} + # # --------------------------------------------------------------------------- # @@ -1182,7 +1187,7 @@ KVER=$(ls ${LIVE_ROOTDIR}/var/log/packages/kernel*modules* |head -1 |rev | cut - # Create an initrd for the generic kernel, using a modified init script: echo "-- Creating initrd for kernel-generic $KVER ..." -chroot ${LIVE_ROOTDIR} /sbin/mkinitrd -c -l us -o /boot/initrd_${KVER}.gz -k ${KVER} -m ${KMODS} 1>${DBGOUT} 2>${DBGOUT} +chroot ${LIVE_ROOTDIR} /sbin/mkinitrd -c -w ${WAIT} -l us -o /boot/initrd_${KVER}.gz -k ${KVER} -m ${KMODS} 1>${DBGOUT} 2>${DBGOUT} cat $LIVE_TOOLDIR/liveinit | sed \ -e "s/@LIVEMAIN@/$LIVEMAIN/g" \ -e "s/@MEDIALABEL@/$MEDIALABEL/g" \ @@ -1219,7 +1224,6 @@ cp -a ${LIVE_TOOLDIR}/EFI ${LIVE_STAGING}/ # The grub-embedded.cfg in the bootx64.efi looks for this file: touch ${LIVE_STAGING}/EFI/BOOT/${MARKER} -touch ${LIVE_STAGING}/${LIVEMAIN}/${MARKER} # Generate the UEFI grub boot image if needed: if [ ! -f ${LIVE_STAGING}/EFI/BOOT/bootx64.efi -o ! -f ${LIVE_STAGING}/boot/syslinux/efiboot.img ]; then |