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 2972 by niro, Thu Jun 30 10:17:00 2016 UTC revision 2993 by niro, Thu Jun 30 10:35:55 2016 UTC
    # Line 155  mbkernel="${HYPERVISOR}" Line 155  mbkernel="${HYPERVISOR}"
    155  mbargs="${HYPERVISOR_ARGS}"  mbargs="${HYPERVISOR_ARGS}"
    156  adddracutargs=""  adddracutargs=""
    157  addplymouthinitrd=""  addplymouthinitrd=""
    158  DEBUGARG="systemd.debug"  DEBUGARG="systemd.log_level=debug systemd.log_target=kmsg"
    159    
    160  usage()  usage()
    161  {  {
    # Line 177  rungrubby() Line 177  rungrubby()
    177   then   then
    178   [[ ${MAKEDEBUG} != yes ]] && return 0   [[ ${MAKEDEBUG} != yes ]] && return 0
    179   [[ -n ${verbose} ]] && echo "- First, making a debug entry."   [[ -n ${verbose} ]] && echo "- First, making a debug entry."
    180   declare -x debugtitle=" with debugging"   if [[ ${ARCH} = s390 ]] || [[ ${ARCH} = s390x ]]
    181     then
    182     declare -x debugtitle="_with_debugging"
    183     else
    184     declare -x debugtitle=" with debugging"
    185     fi
    186   declare -x debugargs="${DEBUGARG}"   declare -x debugargs="${DEBUGARG}"
    187   shift   shift
    188   else   else
    # Line 904  fi Line 909  fi
    909    
    910  if [[ ${ARCH} =~ armv[5|7].*l ]]  if [[ ${ARCH} =~ armv[5|7].*l ]]
    911  then  then
    912   if [ -d ${bootPrefix}/dtb-${version}/ ]   if [[ -z ${SHIPSDTB} ]] || [[ ${SHIPSDTB} != yes ]]
    913   then   then
    914   devtreedir="${bootPrefix}/dtb-${version}/"   if [[ -n ${dtbfile} ]] && [ -f ${bootPrefix}/dtb-${version}/${dtbfile} ]
    915   if [[ -n ${dtbfile} ]] && [ -f ${devtreedir}/${dtbfile} ]   then
    916     devtreefile="${bootPrefix}/dtb-${version}/${dtbfile}"
    917     [[ -n ${verbose} ]] && echo "devtreefile is ${devtreefile}"
    918     elif [ -d ${bootPrefix}/dtb-${version}/ ]
    919   then   then
    920   devtreefile="${devtreedir}/${dtbfile}"   devtreedir="${bootPrefix}/dtb-${version}/"
    921     [[ -n ${verbose} ]] && echo "devtreedir is ${devtreedir}"
    922   fi   fi
    923   fi   fi
    924  fi  fi
    Legend:
    Removed from v.2972  
    changed lines
      Added in v.2993