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 2242 by niro, Mon Oct 21 13:50:31 2013 UTC revision 2699 by niro, Wed Jul 16 10:50:58 2014 UTC
    # Line 116  elif [[ ${ARCH} =~ armv[5|7].*l ]] Line 116  elif [[ ${ARCH} =~ armv[5|7].*l ]]
    116  then  then
    117   liloConfig=""   liloConfig=""
    118   bootPrefix=/boot   bootPrefix=/boot
    119     extlinuxConfig=$(readlink -f /etc/extlinux.conf 2>/dev/null)
    120   ubootDir=${UBOOT_DIR:-"/boot"}   ubootDir=${UBOOT_DIR:-"/boot"}
    121   ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}   ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}
    122   ubootKList=${UBOOT_KLIST:-"klist.txt"}   ubootKList=${UBOOT_KLIST:-"klist.txt"}
    # Line 144  initrd="" Line 145  initrd=""
    145  dracut=""  dracut=""
    146  dracuthostonly=""  dracuthostonly=""
    147  initrdfile=""  initrdfile=""
    148    devtreefile=""
    149  moddep=""  moddep=""
    150  verbose=""  verbose=""
    151  makedefault=""  makedefault=""
    # Line 161  usage() Line 163  usage()
    163   echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2   echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2
    164   echo "       [--mbargs=mbargs] [--make-default] [--add-dracut-args]" >&2   echo "       [--mbargs=mbargs] [--make-default] [--add-dracut-args]" >&2
    165   echo "       [--add-plymouth-initrd]" >&2   echo "       [--add-plymouth-initrd]" >&2
    166   echo "       [--host-only]" >&2   echo "       [--host-only] [--devtree=<devicetree.dtb>]" >&2
    167   echo "       <--install | --remove | --update> <kernel-version>" >&2   echo "       <--install | --remove | --update> <kernel-version>" >&2
    168   echo "       (ex: $(basename $0) --mkinitrd --depmod --install 2.4.7-2)" >&2   echo "       (ex: $(basename $0) --mkinitrd --depmod --install 2.4.7-2)" >&2
    169   exit 1   exit 1
    # Line 188  install() Line 190  install()
    190   fi   fi
    191   fi   fi
    192    
    193     DEVTREE=""
    194     if [[ x${devtreefile} != x ]] && [ -f ${devtreefile} ]
    195     then
    196     [[ -n ${verbose} ]] && echo "found ${devtreefile} and using it with grubby"
    197     DEVTREE="--devtree ${devtreefile}"
    198     fi
    199    
    200   # FIXME: is this a good heuristic to find out if we're on iSeries?   # FIXME: is this a good heuristic to find out if we're on iSeries?
    201   if [ -d /proc/iSeries ]   if [ -d /proc/iSeries ]
    202   then   then
    # Line 219  install() Line 228  install()
    228    
    229   if [[ -n ${banner} ]]   if [[ -n ${banner} ]]
    230   then   then
    231   title="${banner} [ ${version} ]"   if [[ ${ARCH} = s390 ]] || [[ ${ARCH} = s390x ]]
    232   elif [[ $(read_os_release id) = magellan ]]   then
    233     title=$(echo ${banner} | sed 's/ /_/g')
    234     else
    235     title="${banner} [ ${version} ]"
    236     fi
    237     elif [[ ${ARCH} = s390 ]] || [[ ${ARCH} = s390x ]]
    238     then
    239     title=$(echo ${version} | sed 's/ /_/g')
    240     elif [ -f /etc/os-release ]
    241   then   then
    242   title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"   title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
    243   elif [ -f /etc/mageversion ]   elif [ -f /etc/mageversion ]
    # Line 260  install() Line 277  install()
    277   [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"
    278    
    279   ${grubby} --grub2 -c ${grub2EfiConfig} --efi \   ${grubby} --grub2 -c ${grub2EfiConfig} --efi \
    280   --add-kernel=${kernelImage} \   --add-kernel=${kernelImage} ${DEVTREE} \
    281   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    282   ${mbkernel:+--add-multiboot="${mbkernel}"} \   ${mbkernel:+--add-multiboot="${mbkernel}"} \
    283   ${mbargs:+--mbargs="${mbargs}"} \   ${mbargs:+--mbargs="${mbargs}"} \
    # Line 274  install() Line 291  install()
    291   [[ -n ${verbose} ]] && echo "adding ${version} to ${liloConfig}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${liloConfig}"
    292    
    293   ${grubby} --add-kernel=${kernelImage} ${INITRD} \   ${grubby} --add-kernel=${kernelImage} ${INITRD} \
    294   --copy-default ${makedefault} --title ${version} \   --copy-default ${makedefault} --title "${title}" \
    295   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
    296   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${version}" \   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${version}" \
    297   --${liloFlag}   --${liloFlag}
    # Line 404  remove() Line 421  remove()
    421   fi   fi
    422    
    423   mv ${tmpKList} ${ubootDir}/${ubootKList}   mv ${tmpKList} ${ubootDir}/${ubootKList}
    424     [ -x /sbin/a-b-c ] && /sbin/a-b-c
    425   else   else
    426   [[ -n ${verbose} ]] && echo "uImage ${newversion} does not exist!"   [[ -n ${verbose} ]] && echo "uImage ${newversion} does not exist!"
    427   [ -f ${tmpKList} ] && rm -f ${tmpKList}   [ -f ${tmpKList} ] && rm -f ${tmpKList}
    # Line 452  update() Line 470  update()
    470   --update-kernel=${kernelImage} \   --update-kernel=${kernelImage} \
    471   ${INITRD} \   ${INITRD} \
    472   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    473   ${removeargs:+--remove-args="${removeargs}"}   ${removeargs:+--remove-args="${removeargs}"} \
    474     ${mbkernel:+--add-multiboot="${mbkernel}"}
    475   else   else
    476   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
    477   fi   fi
    # Line 530  update() Line 549  update()
    549   [[ -n ${verbose} ]] && echo "copy uInitrd-${version} error, kernel not installed!" && exit   [[ -n ${verbose} ]] && echo "copy uInitrd-${version} error, kernel not installed!" && exit
    550   fi   fi
    551   echo ${version} >> ${ubootDir}/${ubootKList}   echo ${version} >> ${ubootDir}/${ubootKList}
    552     [ -x /sbin/a-b-c ] && /sbin/a-b-c
    553   else   else
    554   [[ -n ${verbose} ]] && echo "cannot make ${version} the default"   [[ -n ${verbose} ]] && echo "cannot make ${version} the default"
    555   fi   fi
    # Line 586  doRmmoddep() Line 606  doRmmoddep()
    606   if [ -d /lib/modules/${version} ]   if [ -d /lib/modules/${version} ]
    607   then   then
    608   rm -f /lib/modules/${version}/modules.*.bin \   rm -f /lib/modules/${version}/modules.*.bin \
    609   /lib/modules/${version}/modules.{alias|dep|devname|symbols|softdep}   /lib/modules/${version}/modules.{alias,dep,devname,symbols,softdep}
    610   fi   fi
    611  }  }
    612    
    # Line 602  do Line 622  do
    622   initrd="remove"   initrd="remove"
    623   ;;   ;;
    624    
    625     --devtree*)
    626     if [[ $1 == --devtree\=* ]]
    627     then
    628     devtreefile="${1#--devtreefile=}"
    629     else
    630     devtreefile="$2"
    631     shift
    632     fi
    633     ;;
    634    
    635   --dracut)   --dracut)
    636   dracut=--dracut   dracut=--dracut
    637   ;;   ;;
    Legend:
    Removed from v.2242  
    changed lines
      Added in v.2699