diff options
| -rwxr-xr-x | make_slackware_live.sh | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh index d48d2c3..3a799ba 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -1755,10 +1755,12 @@ for SPS in ${SL_SERIES} ; do cleanup exit 1 else - # Do we use old style (vmlinuz-generic-$KGEN) or new style - # (vmlinuz-$KGEN-generic) kernel image name? - if [ -f ${INSTDIR}/boot/vmlinuz-${KGEN}-generic ]; then - KIMGNAME_STYLE="NEW" + # Do we use old style (vmlinuz-generic-$KGEN) or one of the new styles + # (vmlinuz-$KGEN-generic or vmlinux-$KGEN) kernel image name? + if [ -f ${INSTDIR}/boot/vmlinuz-${KGEN} ]; then + KIMGNAME_STYLE="NEW2" + elif [ -f ${INSTDIR}/boot/vmlinuz-${KGEN}-generic ]; then + KIMGNAME_STYLE="NEW1" else KIMGNAME_STYLE="OLD" fi @@ -3545,10 +3547,12 @@ umount -R ${LIVE_ROOTDIR} || true # Note to self: syslinux does not 'see' files unless they are DOS 8.3 names? rm -rf ${LIVE_STAGING}/boot mkdir -p ${LIVE_STAGING}/boot -if [ "${KIMGNAME_STYLE}" = "OLD" ]; then - cp -a ${LIVE_BOOT}/boot/vmlinuz-generic*-${KGEN} ${LIVE_STAGING}/boot/generic -else +if [ "${KIMGNAME_STYLE}" = "NEW2" ]; then + cp -a ${LIVE_BOOT}/boot/vmlinuz-${KGEN} ${LIVE_STAGING}/boot/generic +elif [ "${KIMGNAME_STYLE}" = "NEW1" ]; then cp -a ${LIVE_BOOT}/boot/vmlinuz-${KGEN}-generic ${LIVE_STAGING}/boot/generic +else + cp -a ${LIVE_BOOT}/boot/vmlinuz-generic*-${KGEN} ${LIVE_STAGING}/boot/generic fi mv ${LIVE_BOOT}/boot/initrd_${KVER}.img ${LIVE_STAGING}/boot/initrd.img |