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 3006 by niro, Tue Jun 27 14:26:38 2017 UTC revision 3045 by niro, Thu Jul 6 12:17:30 2017 UTC
    # Line 186  rungrubby() Line 186  rungrubby()
    186   declare -x debugargs="${DEBUGARG}"   declare -x debugargs="${DEBUGARG}"
    187   shift   shift
    188   else   else
    189   [[ -n ${verbose} ] && echo "- Making a normal entry."   [[ -n ${verbose} ]] && echo "- Making a normal entry."
    190   fi   fi
    191   $(eval $grubby $@)   $(eval $grubby $@)
    192   export -n debugargs   export -n debugargs
    # Line 296  install() Line 296  install()
    296   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
    297   --remove-kernel=\"TITLE=${title}\${debugtitle}\""   --remove-kernel=\"TITLE=${title}\${debugtitle}\""
    298   rungrubby ${ARGS} ${makedefault}   rungrubby ${ARGS} ${makedefault}
    299   rungrubby --debug ${ARGS}   rungrubby --debug ${ARGS} --set-index=1
    300   else   else
    301   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    302   fi   fi
    # Line 311  install() Line 311  install()
    311   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
    312   --remove-kernel=\"TITLE=${title}\${debugtitle}\""   --remove-kernel=\"TITLE=${title}\${debugtitle}\""
    313   rungrubby ${ARGS} ${makedefault}   rungrubby ${ARGS} ${makedefault}
    314   rungrubby --debug ${ARGS}   rungrubby --debug ${ARGS} --set-index=1
    315   else   else
    316   [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"   [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
    317   fi   fi
    # Line 327  install() Line 327  install()
    327   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
    328   --remove-kernel=\"TITLE=${title}\${debugtitle}\""   --remove-kernel=\"TITLE=${title}\${debugtitle}\""
    329   rungrubby ${ARGS} ${makedefault}   rungrubby ${ARGS} ${makedefault}
    330   rungrubby --debug ${ARGS}   rungrubby --debug ${ARGS} --set-index=1
    331   else   else
    332   [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby for grub 2 with UEFI"   [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby for grub 2 with UEFI"
    333   fi   fi
    # Line 343  install() Line 343  install()
    343   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
    344   --remove-kernel=\"TITLE=${version}\""   --remove-kernel=\"TITLE=${version}\""
    345   rungrubby ${ARGS} ${makedefault}   rungrubby ${ARGS} ${makedefault}
    346   rungrubby --debug ${ARGS}   rungrubby --debug ${ARGS} --set-index=1
    347    
    348   if [[ -n ${runLilo} ]]   if [[ -n ${runLilo} ]]
    349   then   then
    # Line 371  install() Line 371  install()
    371   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
    372   --remove-kernel=\"TITLE=${title}\${debugtitle}\""   --remove-kernel=\"TITLE=${title}\${debugtitle}\""
    373   rungrubby ${ARGS} ${makedefault}   rungrubby ${ARGS} ${makedefault}
    374   rungrubby --debug ${ARGS}   rungrubby --debug ${ARGS} --set-index=1
    375   else   else
    376   [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"   [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
    377   fi   fi
    # Line 926  fi Line 926  fi
    926    
    927  # add dracut kernel args if requested  # add dracut kernel args if requested
    928  if [[ -n ${dracut} ]] && [[ -n ${adddracutargs} ]]  if [[ -n ${dracut} ]] && [[ -n ${adddracutargs} ]]
    929    then
    930   [ -r /etc/vconsole.conf ] && . /etc/vconsole.conf   [ -r /etc/vconsole.conf ] && . /etc/vconsole.conf
    931   [ -r /etc/locale.conf ] && . /etc/locale.conf   [ -r /etc/locale.conf ] && . /etc/locale.conf
    932    
    Legend:
    Removed from v.3006  
    changed lines
      Added in v.3045