Magellan Linux

  • Back to homepage
    • /[magellan-source]/tags/grubby-8_37/new-kernel-pkg

    Diff of /tags/grubby-8_37/new-kernel-pkg

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

    revision 2244 by niro, Mon Oct 21 13:52:07 2013 UTC revision 2263 by niro, Mon Oct 21 14:08:21 2013 UTC
    # Line 116  elif [[ ${ARCH} =~ armv[5|7].*l ]] Line 116  elif [[ ${ARCH} =~ armv[5|7].*l ]]
    116  then  then
    117   liloConfig=""   liloConfig=""
    118   bootPrefix=/boot   bootPrefix=/boot
    119     extlinuxConfig=$(readlink -f /etc/extlinux.conf 2>/dev/null)
    120   ubootDir=${UBOOT_DIR:-"/boot"}   ubootDir=${UBOOT_DIR:-"/boot"}
    121   ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}   ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}
    122   ubootKList=${UBOOT_KLIST:-"klist.txt"}   ubootKList=${UBOOT_KLIST:-"klist.txt"}
    # Line 404  remove() Line 405  remove()
    405   fi   fi
    406    
    407   mv ${tmpKList} ${ubootDir}/${ubootKList}   mv ${tmpKList} ${ubootDir}/${ubootKList}
    408     [ -x /sbin/a-b-c ] && /sbin/a-b-c
    409   else   else
    410   [[ -n ${verbose} ]] && echo "uImage ${newversion} does not exist!"   [[ -n ${verbose} ]] && echo "uImage ${newversion} does not exist!"
    411   [ -f ${tmpKList} ] && rm -f ${tmpKList}   [ -f ${tmpKList} ] && rm -f ${tmpKList}
    # Line 452  update() Line 454  update()
    454   --update-kernel=${kernelImage} \   --update-kernel=${kernelImage} \
    455   ${INITRD} \   ${INITRD} \
    456   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    457   ${removeargs:+--remove-args="${removeargs}"}   ${removeargs:+--remove-args="${removeargs}"} \
    458     ${mbkernel:+--add-multiboot="${mbkernel}"}
    459   else   else
    460   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
    461   fi   fi
    # Line 530  update() Line 533  update()
    533   [[ -n ${verbose} ]] && echo "copy uInitrd-${version} error, kernel not installed!" && exit   [[ -n ${verbose} ]] && echo "copy uInitrd-${version} error, kernel not installed!" && exit
    534   fi   fi
    535   echo ${version} >> ${ubootDir}/${ubootKList}   echo ${version} >> ${ubootDir}/${ubootKList}
    536     [ -x /sbin/a-b-c ] && /sbin/a-b-c
    537   else   else
    538   [[ -n ${verbose} ]] && echo "cannot make ${version} the default"   [[ -n ${verbose} ]] && echo "cannot make ${version} the default"
    539   fi   fi
    Legend:
    Removed from v.2244  
    changed lines
      Added in v.2263