Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mlivecdbuild/mlivecdbuild2.sh

    Diff of /trunk/mlivecdbuild/mlivecdbuild2.sh

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 2122 by niro, Thu May 16 13:23:45 2013 UTC revision 2123 by niro, Thu May 16 13:24:53 2013 UTC
    # Line 396  install_bootloader() Line 396  install_bootloader()
    396   install ${ISOLINUX_BIN} ${CDISOROOT}/isolinux || die   install ${ISOLINUX_BIN} ${CDISOROOT}/isolinux || die
    397    
    398   # kernel   # kernel
    399   local kimg="$(basename $(readlink ${CDCHROOTDIR}/boot/vmlinuz))"   # support kernel installations without symlinks
    400     if [ -L ${CDCHROOTDIR}/boot/vmlinuz ]
    401     then
    402     local kimg="$(basename $(readlink ${CDCHROOTDIR}/boot/vmlinuz))"
    403     else
    404     local kimg="$(find ${CDCHROOTDIR}/boot -name kernel-\* -printf '%f\n')"
    405     fi
    406   install ${CDCHROOTDIR}/boot/${kimg} ${CDISOROOT}/isolinux/${CDKERNELNAME} || die   install ${CDCHROOTDIR}/boot/${kimg} ${CDISOROOT}/isolinux/${CDKERNELNAME} || die
    407    
    408   install -m 0644 $(get_profile isolinux.cfg) ${CDISOROOT}/isolinux || die   install -m 0644 $(get_profile isolinux.cfg) ${CDISOROOT}/isolinux || die
    # Line 427  generate_initrd() Line 433  generate_initrd()
    433   echo Generating initrd image ...   echo Generating initrd image ...
    434   echo '#!/bin/bash' > ${CHROOTSH} || die   echo '#!/bin/bash' > ${CHROOTSH} || die
    435   echo 'export LC_ALL=C' >> ${CHROOTSH} || die   echo 'export LC_ALL=C' >> ${CHROOTSH} || die
    436   echo 'kv="$(readlink /boot/vmlinuz)"' >> ${CHROOTSH} || die   # support kernel installations without symlinks
    437   echo 'kv="${kv/kernel-}/"' >> ${CHROOTSH} || die   if [ -L ${CDCHROOTDIR}/boot/vmlinuz ]
    438     then
    439     echo 'kv="$(readlink /boot/vmlinuz)"' >> ${CHROOTSH} || die
    440     else
    441     echo "kv=\$(find /boot -name kernel-\* -printf '%f\n')" >> ${CHROOTSH} || die
    442     fi
    443     echo 'kv="${kv/kernel-/}"' >> ${CHROOTSH} || die
    444   # prefer dracut   # prefer dracut
    445   echo 'if [[ -x /sbin/dracut ]] || [[ -x /usr/sbin/dracut ]] || [[ -x /usr/bin/dracut ]]' >> ${CHROOTSH} || die   echo 'if [[ -x /sbin/dracut ]] || [[ -x /usr/sbin/dracut ]] || [[ -x /usr/bin/dracut ]]' >> ${CHROOTSH} || die
    446   echo 'then' >> ${CHROOTSH} || die   echo 'then' >> ${CHROOTSH} || die
    Legend:
    Removed from v.2122  
    changed lines
      Added in v.2123