Magellan Linux

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

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

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

    revision 2965 by niro, Wed Jun 29 14:52:33 2016 UTC revision 2971 by niro, Thu Jun 30 10:06:57 2016 UTC
    # Line 352  install() Line 352  install()
    352   [[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"
    353    
    354   ARGS="--extlinux -c ${extlinuxConfig} --add-kernel=${kernelImage} \   ARGS="--extlinux -c ${extlinuxConfig} --add-kernel=${kernelImage} \
    355   ${INITRD} --copy-default --title \"${title}\${debugtitle}\" \   ${DEVTREE} ${INITRD} --copy-default --title \"${title}\${debugtitle}\" \
    356   ${mbkernel:+--add-multiboot=\"${mbkernel}\"} \   ${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
    357   ${mbargs:+--mbargs=\"${mbargs}\"} \   ${mbargs:+--mbargs=\"${mbargs}\"} \
    358   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
    # Line 505  update() Line 505  update()
    505   fi   fi
    506   fi   fi
    507    
    508     DEVTREE=""
    509     if [[ x${devtreefile} != x ]] && [ -f ${devtreefile} ]
    510     then
    511     [[ -n ${verbose} ]] && echo "found ${devtreefile} and using it with grubby"
    512     DEVTREE="--devtree ${devtreefile}"
    513     fi
    514    
    515   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    516   then   then
    517   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"
    # Line 607  update() Line 614  update()
    614   then   then
    615   [[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"
    616   ARGS="--extlinux -c ${extlinuxConfig} --update-kernel=${kernelImage} \   ARGS="--extlinux -c ${extlinuxConfig} --update-kernel=${kernelImage} \
    617   ${INITRD} ${kernargs:+--args=\"${kernargs}\"} \   ${DEVTREE} ${INITRD} ${kernargs:+--args=\"${kernargs}\"} \
    618   ${removeargs:+--remove-args=\"${removeargs}\"} \   ${removeargs:+--remove-args=\"${removeargs}\"} \
    619   --title=\"${title}\${debugtitle}\""   --title=\"${title}\${debugtitle}\""
    620   rungrubby --debug ${ARGS}   rungrubby --debug ${ARGS}
    # Line 870  then Line 877  then
    877  fi  fi
    878  [[ -n ${verbose} ]] && echo "initrdfile is ${initrdfile}"  [[ -n ${verbose} ]] && echo "initrdfile is ${initrdfile}"
    879    
    880    if [[ ${ARCH} =~ armv[5|7].*l ]]
    881    then
    882     if [ -d ${bootPrefix}/dtb-${version}/ ]
    883     then
    884     devtreedir="${bootPrefix}/dtb-${version}/"
    885     if [[ -n ${dtbfile} ]] && [ -f ${devtreedir}/${dtbfile} ]
    886     then
    887     devtreefile="${devtreedir}/${dtbfile}"
    888     fi
    889     fi
    890    fi
    891    [[ -n ${verbose} ]] && echo "devtreedir is ${devtreedir}"
    892    
    893  # add dracut i18n, keyboard and plymouth kernel args if requested  # add dracut i18n, keyboard and plymouth kernel args if requested
    894  if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]]  if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]]
    895  then  then
    Legend:
    Removed from v.2965  
    changed lines
      Added in v.2971