Magellan Linux

  • Back to homepage
    • /[magellan-source]/tags/grubby-8_37/new-kernel-pkg

    Diff of /tags/grubby-8_37/new-kernel-pkg

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

    revision 2248 by niro, Mon Oct 21 13:55:31 2013 UTC revision 2684 by niro, Wed Jul 16 10:26:39 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 219  install() Line 220  install()
    220    
    221   if [[ -n ${banner} ]]   if [[ -n ${banner} ]]
    222   then   then
    223   title="${banner} [ ${version} ]"   if [[ ${ARCH} = s390 ]] || [[ ${ARCH} = s390x ]]
    224   elif [[ $(read_os_release id) = magellan ]]   then
    225     title=$(echo ${banner} | sed 's/ /_/g')
    226     else
    227     title="${banner} [ ${version} ]"
    228     fi
    229     elif [[ ${ARCH} = s390 ]] || [[ ${ARCH} = s390x ]]
    230     then
    231     title=$(echo ${version} | sed 's/ /_/g')
    232     elif [ -f /etc/os-release ]
    233   then   then
    234   title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"   title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
    235   elif [ -f /etc/mageversion ]   elif [ -f /etc/mageversion ]
    # Line 274  install() Line 283  install()
    283   [[ -n ${verbose} ]] && echo "adding ${version} to ${liloConfig}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${liloConfig}"
    284    
    285   ${grubby} --add-kernel=${kernelImage} ${INITRD} \   ${grubby} --add-kernel=${kernelImage} ${INITRD} \
    286   --copy-default ${makedefault} --title ${version} \   --copy-default ${makedefault} --title "${title}" \
    287   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
    288   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${version}" \   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${version}" \
    289   --${liloFlag}   --${liloFlag}
    # Line 453  update() Line 462  update()
    462   --update-kernel=${kernelImage} \   --update-kernel=${kernelImage} \
    463   ${INITRD} \   ${INITRD} \
    464   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    465   ${removeargs:+--remove-args="${removeargs}"}   ${removeargs:+--remove-args="${removeargs}"} \
    466     ${mbkernel:+--add-multiboot="${mbkernel}"}
    467   else   else
    468   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
    469   fi   fi
    Legend:
    Removed from v.2248  
    changed lines
      Added in v.2684