Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/grubby/new-kernel-pkg

    Diff of /trunk/grubby/new-kernel-pkg

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

    revision 2961 by niro, Wed Jun 29 14:39:19 2016 UTC revision 2965 by niro, Wed Jun 29 14:52:33 2016 UTC
    # Line 657  doRmmoddep() Line 657  doRmmoddep()
    657   fi   fi
    658  }  }
    659    
    660    # kernel image for 2.4 is kernel
    661    if [[ ${ARCH} = ppc64 ]] || [[ ${ARCH} = ppc ]]
    662    then
    663     if [[ ${kernelmajor} = 2.4 ]]
    664     then
    665     kernelName=kernel
    666     fi
    667    fi
    668    
    669  while [ $# -gt 0 ]  while [ $# -gt 0 ]
    670  do  do
    # Line 794  do Line 802  do
    802   fi   fi
    803   ;;   ;;
    804    
    805     --kernel-name*)
    806     if [[ $1 == --kernel-name\=* ]]
    807     then
    808     kernelName=${1#--kernel-name=}
    809     else
    810     kernelName="$2"
    811     shift
    812     fi
    813     ;;
    814    
    815   -v)   -v)
    816   verbose=-v   verbose=-v
    817   ;;   ;;
    # Line 832  fi Line 850  fi
    850    
    851  kernelmajor=$(echo ${kernel} | cut -d . -f 1,2)  kernelmajor=$(echo ${kernel} | cut -d . -f 1,2)
    852    
     # kernel image for 2.4 is kernel  
     if [[ ${ARCH} = ppc64 ]] || [[ ${ARCH} = ppc ]]  
     then  
      if [[ ${kernelmajor} = 2.4 ]]  
      then  
      kernelName=kernel  
      fi  
     fi  
       
    853  [[ ${kernelImage} ]] || kernelImage="${bootPrefix}/${kernelName}-${version}"  [[ ${kernelImage} ]] || kernelImage="${bootPrefix}/${kernelName}-${version}"
    854    
    855  # set the initrd file based on arch; ia64 is the only currently known oddball  # set the initrd file based on arch; ia64 is the only currently known oddball
    # Line 907  then Line 916  then
    916  fi  fi
    917    
    918  # set this as the default if we have the package and it matches  # set this as the default if we have the package and it matches
    919  if [[ ${mode} = --install ]] && [[ ${UPDATEDEFAULT} = yes ]] && [[ -n ${package} ]] &&  if [[ ${mode} = --install ]] && [[ ${UPDATEDEFAULT} = yes ]] && [[ -n ${package} ]] && [[ -n ${DEFAULTKERNEL} ]]
      [[ -n ${DEFAULTKERNEL} ]] && [[ ${package} = ${DEFAULTKERNEL} ]]  
    920  then  then
    921   makedefault="--make-default"   if [[ ${package} = ${DEFAULTKERNEL} ]] || [[ ${package}-core = ${DEFAULTKERNEL} ]]
    922   [[ -n ${verbose} ]] && echo "making it the default based on config"   then
    923     makedefault="--make-default"
    924     [[ -n ${verbose} ]] && echo "making it the default based on config"
    925     fi
    926  fi  fi
    927    
    928  if [[ ${moddep} = make ]]  if [[ ${moddep} = make ]]
    Legend:
    Removed from v.2961  
    changed lines
      Added in v.2965