Magellan Linux

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

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

revision 2964 by niro, Wed Jun 29 14:45:50 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

Legend:
Removed from v.2964  
changed lines
  Added in v.2965