Magellan Linux

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

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

revision 2681 by niro, Wed Jul 16 09:48:55 2014 UTC revision 2684 by niro, Wed Jul 16 10:26:39 2014 UTC
# Line 220  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     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 ]   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} ]"
# Line 275  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}

Legend:
Removed from v.2681  
changed lines
  Added in v.2684